diff --git a/cicm_web/Areas/Admin/Controllers/BrowserTestsController.cs b/cicm_web/Areas/Admin/Controllers/BrowserTestsController.cs
index 7b2f8979..064a1ae9 100644
--- a/cicm_web/Areas/Admin/Controllers/BrowserTestsController.cs
+++ b/cicm_web/Areas/Admin/Controllers/BrowserTestsController.cs
@@ -35,7 +35,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/CompaniesController.cs b/cicm_web/Areas/Admin/Controllers/CompaniesController.cs
index 21e58262..be84d66b 100644
--- a/cicm_web/Areas/Admin/Controllers/CompaniesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/CompaniesController.cs
@@ -31,14 +31,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/CompanyDescriptionsController.cs b/cicm_web/Areas/Admin/Controllers/CompanyDescriptionsController.cs
index ee2230c5..42c22b93 100644
--- a/cicm_web/Areas/Admin/Controllers/CompanyDescriptionsController.cs
+++ b/cicm_web/Areas/Admin/Controllers/CompanyDescriptionsController.cs
@@ -31,7 +31,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Markdig;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -39,7 +39,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/CompanyLogosController.cs b/cicm_web/Areas/Admin/Controllers/CompanyLogosController.cs
index dbd164e4..30b5a43e 100644
--- a/cicm_web/Areas/Admin/Controllers/CompanyLogosController.cs
+++ b/cicm_web/Areas/Admin/Controllers/CompanyLogosController.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
@@ -15,7 +15,7 @@ using Microsoft.EntityFrameworkCore.Query;
 using SkiaSharp;
 using SKSvg = SkiaSharp.Extended.Svg.SKSvg;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/DocumentCompaniesController.cs b/cicm_web/Areas/Admin/Controllers/DocumentCompaniesController.cs
index 0963057c..131fa59b 100644
--- a/cicm_web/Areas/Admin/Controllers/DocumentCompaniesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/DocumentCompaniesController.cs
@@ -1,13 +1,13 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/DocumentPeopleController.cs b/cicm_web/Areas/Admin/Controllers/DocumentPeopleController.cs
index 606758a6..5e43ad42 100644
--- a/cicm_web/Areas/Admin/Controllers/DocumentPeopleController.cs
+++ b/cicm_web/Areas/Admin/Controllers/DocumentPeopleController.cs
@@ -1,13 +1,13 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/GpusByMachineController.cs b/cicm_web/Areas/Admin/Controllers/GpusByMachineController.cs
index 7addd60d..eedd28d0 100644
--- a/cicm_web/Areas/Admin/Controllers/GpusByMachineController.cs
+++ b/cicm_web/Areas/Admin/Controllers/GpusByMachineController.cs
@@ -1,14 +1,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/GpusByOwnedMachineController.cs b/cicm_web/Areas/Admin/Controllers/GpusByOwnedMachineController.cs
index 87c9c40f..2b255d9f 100644
--- a/cicm_web/Areas/Admin/Controllers/GpusByOwnedMachineController.cs
+++ b/cicm_web/Areas/Admin/Controllers/GpusByOwnedMachineController.cs
@@ -1,14 +1,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/GpusController.cs b/cicm_web/Areas/Admin/Controllers/GpusController.cs
index 8ebf32e6..b63f5893 100644
--- a/cicm_web/Areas/Admin/Controllers/GpusController.cs
+++ b/cicm_web/Areas/Admin/Controllers/GpusController.cs
@@ -31,14 +31,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/HomeController.cs b/cicm_web/Areas/Admin/Controllers/HomeController.cs
index b04d947a..ac8040ac 100644
--- a/cicm_web/Areas/Admin/Controllers/HomeController.cs
+++ b/cicm_web/Areas/Admin/Controllers/HomeController.cs
@@ -30,7 +30,7 @@
 
 using Microsoft.AspNetCore.Mvc;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     public class HomeController : Controller
diff --git a/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs b/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs
index c7df78c3..fc12314a 100644
--- a/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs
+++ b/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs
@@ -1,14 +1,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsController.cs b/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsController.cs
index dbb1b62a..a04cfdee 100644
--- a/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsController.cs
+++ b/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsController.cs
@@ -36,7 +36,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/InstructionSetsController.cs b/cicm_web/Areas/Admin/Controllers/InstructionSetsController.cs
index e4805966..d60706b4 100644
--- a/cicm_web/Areas/Admin/Controllers/InstructionSetsController.cs
+++ b/cicm_web/Areas/Admin/Controllers/InstructionSetsController.cs
@@ -36,7 +36,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/LicensesController.cs b/cicm_web/Areas/Admin/Controllers/LicensesController.cs
index 21d132e3..6a023666 100644
--- a/cicm_web/Areas/Admin/Controllers/LicensesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/LicensesController.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace cicm_web
+namespace Marechai
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs b/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs
index 00aaf890..35ac888c 100644
--- a/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs
@@ -31,14 +31,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/MachinePhotosController.cs b/cicm_web/Areas/Admin/Controllers/MachinePhotosController.cs
index f09867f5..2dcaf655 100644
--- a/cicm_web/Areas/Admin/Controllers/MachinePhotosController.cs
+++ b/cicm_web/Areas/Admin/Controllers/MachinePhotosController.cs
@@ -3,8 +3,8 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
-using cicm_web.Helpers;
+using Marechai.Areas.Admin.Models;
+using Marechai.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
@@ -14,7 +14,7 @@ using Microsoft.EntityFrameworkCore;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/MachinesController.cs b/cicm_web/Areas/Admin/Controllers/MachinesController.cs
index 5883be21..40f541c3 100644
--- a/cicm_web/Areas/Admin/Controllers/MachinesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/MachinesController.cs
@@ -33,14 +33,14 @@ using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/MemoryByMachinesController.cs b/cicm_web/Areas/Admin/Controllers/MemoryByMachinesController.cs
index 21929bfc..659c8c0a 100644
--- a/cicm_web/Areas/Admin/Controllers/MemoryByMachinesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/MemoryByMachinesController.cs
@@ -31,14 +31,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/MemoryByOwnedMachinesController.cs b/cicm_web/Areas/Admin/Controllers/MemoryByOwnedMachinesController.cs
index f06e645c..2c76a9dc 100644
--- a/cicm_web/Areas/Admin/Controllers/MemoryByOwnedMachinesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/MemoryByOwnedMachinesController.cs
@@ -31,14 +31,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/NewsController.cs b/cicm_web/Areas/Admin/Controllers/NewsController.cs
index 58db5435..285f6dc3 100644
--- a/cicm_web/Areas/Admin/Controllers/NewsController.cs
+++ b/cicm_web/Areas/Admin/Controllers/NewsController.cs
@@ -35,7 +35,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/OwnedMachineController.cs b/cicm_web/Areas/Admin/Controllers/OwnedMachineController.cs
index cfc316cc..6b6165f7 100644
--- a/cicm_web/Areas/Admin/Controllers/OwnedMachineController.cs
+++ b/cicm_web/Areas/Admin/Controllers/OwnedMachineController.cs
@@ -1,13 +1,13 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/PeopleController.cs b/cicm_web/Areas/Admin/Controllers/PeopleController.cs
index 07e390f2..1b32e007 100644
--- a/cicm_web/Areas/Admin/Controllers/PeopleController.cs
+++ b/cicm_web/Areas/Admin/Controllers/PeopleController.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/ProcessorsByMachinesController.cs b/cicm_web/Areas/Admin/Controllers/ProcessorsByMachinesController.cs
index 7e7b0a1a..04280da9 100644
--- a/cicm_web/Areas/Admin/Controllers/ProcessorsByMachinesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ProcessorsByMachinesController.cs
@@ -31,14 +31,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/ProcessorsByOwnedMachinesController.cs b/cicm_web/Areas/Admin/Controllers/ProcessorsByOwnedMachinesController.cs
index ee964679..4e7e4afd 100644
--- a/cicm_web/Areas/Admin/Controllers/ProcessorsByOwnedMachinesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ProcessorsByOwnedMachinesController.cs
@@ -31,14 +31,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/ProcessorsController.cs b/cicm_web/Areas/Admin/Controllers/ProcessorsController.cs
index ad08ee63..850eaaeb 100644
--- a/cicm_web/Areas/Admin/Controllers/ProcessorsController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ProcessorsController.cs
@@ -31,14 +31,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/ResolutionsByGpuController.cs b/cicm_web/Areas/Admin/Controllers/ResolutionsByGpuController.cs
index 7bff1554..4989fe7d 100644
--- a/cicm_web/Areas/Admin/Controllers/ResolutionsByGpuController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ResolutionsByGpuController.cs
@@ -1,14 +1,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs b/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs
index b318fd0e..298e8018 100644
--- a/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/ResolutionsController.cs b/cicm_web/Areas/Admin/Controllers/ResolutionsController.cs
index 5cae4a5d..0ac2e58d 100644
--- a/cicm_web/Areas/Admin/Controllers/ResolutionsController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ResolutionsController.cs
@@ -35,7 +35,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs b/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs
index 73b1d9cf..25e8b3fe 100644
--- a/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs
@@ -1,14 +1,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/ScreensController.cs b/cicm_web/Areas/Admin/Controllers/ScreensController.cs
index 9229d564..3f8a2071 100644
--- a/cicm_web/Areas/Admin/Controllers/ScreensController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ScreensController.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/SoundByMachineController.cs b/cicm_web/Areas/Admin/Controllers/SoundByMachineController.cs
index 677e9d31..1b7c114f 100644
--- a/cicm_web/Areas/Admin/Controllers/SoundByMachineController.cs
+++ b/cicm_web/Areas/Admin/Controllers/SoundByMachineController.cs
@@ -1,14 +1,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/SoundByOwnedMachineController.cs b/cicm_web/Areas/Admin/Controllers/SoundByOwnedMachineController.cs
index bbfada05..5931f555 100644
--- a/cicm_web/Areas/Admin/Controllers/SoundByOwnedMachineController.cs
+++ b/cicm_web/Areas/Admin/Controllers/SoundByOwnedMachineController.cs
@@ -1,14 +1,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/SoundSynthsController.cs b/cicm_web/Areas/Admin/Controllers/SoundSynthsController.cs
index 8b7f61cc..c39465de 100644
--- a/cicm_web/Areas/Admin/Controllers/SoundSynthsController.cs
+++ b/cicm_web/Areas/Admin/Controllers/SoundSynthsController.cs
@@ -31,14 +31,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/StorageByMachinesController.cs b/cicm_web/Areas/Admin/Controllers/StorageByMachinesController.cs
index 338ee13d..42a41e95 100644
--- a/cicm_web/Areas/Admin/Controllers/StorageByMachinesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/StorageByMachinesController.cs
@@ -31,14 +31,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Controllers/StorageByOwnedMachinesController.cs b/cicm_web/Areas/Admin/Controllers/StorageByOwnedMachinesController.cs
index d7b69390..4ed6411a 100644
--- a/cicm_web/Areas/Admin/Controllers/StorageByOwnedMachinesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/StorageByOwnedMachinesController.cs
@@ -31,14 +31,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Marechai.Database.Models;
-using cicm_web.Areas.Admin.Models;
+using Marechai.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 
-namespace cicm_web.Areas.Admin.Controllers
+namespace Marechai.Areas.Admin.Controllers
 {
     [Area("Admin")]
     [Authorize]
diff --git a/cicm_web/Areas/Admin/Models/BaseViewModel.cs b/cicm_web/Areas/Admin/Models/BaseViewModel.cs
index 1313f1ff..5306f9fb 100644
--- a/cicm_web/Areas/Admin/Models/BaseViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/BaseViewModel.cs
@@ -1,4 +1,4 @@
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class BaseViewModel<TKey>
     {
diff --git a/cicm_web/Areas/Admin/Models/CompanyDescriptionViewModel.cs b/cicm_web/Areas/Admin/Models/CompanyDescriptionViewModel.cs
index ce78d21f..02d250f8 100644
--- a/cicm_web/Areas/Admin/Models/CompanyDescriptionViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/CompanyDescriptionViewModel.cs
@@ -28,7 +28,7 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class CompanyDescriptionViewModel : BaseViewModel<int>
     {
diff --git a/cicm_web/Areas/Admin/Models/CompanyLogoViewModel.cs b/cicm_web/Areas/Admin/Models/CompanyLogoViewModel.cs
index b002dff7..e0e70ff1 100644
--- a/cicm_web/Areas/Admin/Models/CompanyLogoViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/CompanyLogoViewModel.cs
@@ -28,7 +28,7 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class CompanyLogoViewModel : BaseViewModel<int>
     {
diff --git a/cicm_web/Areas/Admin/Models/CompanyViewModel.cs b/cicm_web/Areas/Admin/Models/CompanyViewModel.cs
index 772d00de..c3cdb5ab 100644
--- a/cicm_web/Areas/Admin/Models/CompanyViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/CompanyViewModel.cs
@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Marechai.Database;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class CompanyViewModel : BaseViewModel<int>
     {
diff --git a/cicm_web/Areas/Admin/Models/DocumentCompanyViewModel.cs b/cicm_web/Areas/Admin/Models/DocumentCompanyViewModel.cs
index 03e5adaa..724dfacf 100644
--- a/cicm_web/Areas/Admin/Models/DocumentCompanyViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/DocumentCompanyViewModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class DocumentCompanyViewModel : BaseViewModel<int>
     {
diff --git a/cicm_web/Areas/Admin/Models/DocumentPersonViewModel.cs b/cicm_web/Areas/Admin/Models/DocumentPersonViewModel.cs
index c9d70426..a6ea04ca 100644
--- a/cicm_web/Areas/Admin/Models/DocumentPersonViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/DocumentPersonViewModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class DocumentPersonViewModel : BaseViewModel<int>
     {
diff --git a/cicm_web/Areas/Admin/Models/GpuViewModel.cs b/cicm_web/Areas/Admin/Models/GpuViewModel.cs
index eb0efd14..b8ddadd3 100644
--- a/cicm_web/Areas/Admin/Models/GpuViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/GpuViewModel.cs
@@ -34,7 +34,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class GpuViewModel : BaseViewModel<int>
     {
diff --git a/cicm_web/Areas/Admin/Models/GpusByMachineViewModel.cs b/cicm_web/Areas/Admin/Models/GpusByMachineViewModel.cs
index 5f3e696d..c3305f81 100644
--- a/cicm_web/Areas/Admin/Models/GpusByMachineViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/GpusByMachineViewModel.cs
@@ -30,7 +30,7 @@
 
 using System.ComponentModel;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class GpusByMachineViewModel : BaseViewModel<long>
     {
diff --git a/cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs b/cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs
index 36257b2c..d2136599 100644
--- a/cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs
@@ -1,4 +1,4 @@
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class InstructionSetExtensionsByProcessorViewModel : BaseViewModel<int>
     {
diff --git a/cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs b/cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs
index b8fa31b9..b4f44090 100644
--- a/cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs
@@ -1,4 +1,4 @@
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class MachineFamilyViewModel : BaseViewModel<int>
     {
diff --git a/cicm_web/Areas/Admin/Models/MachinePhotoDetailsViewModel.cs b/cicm_web/Areas/Admin/Models/MachinePhotoDetailsViewModel.cs
index 24268ef0..0a9bcd64 100644
--- a/cicm_web/Areas/Admin/Models/MachinePhotoDetailsViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/MachinePhotoDetailsViewModel.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Marechai.Database;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class MachinePhotoDetailsViewModel : BaseViewModel<Guid>
     {
diff --git a/cicm_web/Areas/Admin/Models/MachinePhotoViewModel.cs b/cicm_web/Areas/Admin/Models/MachinePhotoViewModel.cs
index ff89b564..a7adb4e6 100644
--- a/cicm_web/Areas/Admin/Models/MachinePhotoViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/MachinePhotoViewModel.cs
@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.AspNetCore.Http;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class MachinePhotoViewModel : BaseViewModel<Guid>
     {
diff --git a/cicm_web/Areas/Admin/Models/MachineViewModel.cs b/cicm_web/Areas/Admin/Models/MachineViewModel.cs
index df735be3..7aec445e 100644
--- a/cicm_web/Areas/Admin/Models/MachineViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/MachineViewModel.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Marechai.Database;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class MachineViewModel : BaseViewModel<int>
     {
diff --git a/cicm_web/Areas/Admin/Models/MemoryByMachineViewModel.cs b/cicm_web/Areas/Admin/Models/MemoryByMachineViewModel.cs
index fa37ea81..aa43837f 100644
--- a/cicm_web/Areas/Admin/Models/MemoryByMachineViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/MemoryByMachineViewModel.cs
@@ -31,7 +31,7 @@
 using System.ComponentModel;
 using Marechai.Database;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class MemoryByMachineViewModel : BaseViewModel<long>
     {
diff --git a/cicm_web/Areas/Admin/Models/OwnedMachineViewModel.cs b/cicm_web/Areas/Admin/Models/OwnedMachineViewModel.cs
index 29d20f19..33e2bd60 100644
--- a/cicm_web/Areas/Admin/Models/OwnedMachineViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/OwnedMachineViewModel.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Marechai.Database;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class OwnedMachineViewModel : BaseViewModel<long>
     {
diff --git a/cicm_web/Areas/Admin/Models/ProcessorViewModel.cs b/cicm_web/Areas/Admin/Models/ProcessorViewModel.cs
index f0e0dc91..b4b033d8 100644
--- a/cicm_web/Areas/Admin/Models/ProcessorViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/ProcessorViewModel.cs
@@ -34,7 +34,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class ProcessorViewModel : BaseViewModel<int>
     {
diff --git a/cicm_web/Areas/Admin/Models/ProcessorsByMachineViewModel.cs b/cicm_web/Areas/Admin/Models/ProcessorsByMachineViewModel.cs
index 1f036657..1ef1e086 100644
--- a/cicm_web/Areas/Admin/Models/ProcessorsByMachineViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/ProcessorsByMachineViewModel.cs
@@ -30,7 +30,7 @@
 
 using System.ComponentModel;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class ProcessorsByMachineViewModel : BaseViewModel<long>
     {
diff --git a/cicm_web/Areas/Admin/Models/ResolutionsByGpuViewModel.cs b/cicm_web/Areas/Admin/Models/ResolutionsByGpuViewModel.cs
index f067c677..9e711af9 100644
--- a/cicm_web/Areas/Admin/Models/ResolutionsByGpuViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/ResolutionsByGpuViewModel.cs
@@ -31,7 +31,7 @@
 using System.ComponentModel;
 using Marechai.Database.Models;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class ResolutionsByGpuViewModel : BaseViewModel<long>
     {
diff --git a/cicm_web/Areas/Admin/Models/ScreensByMachineViewModel.cs b/cicm_web/Areas/Admin/Models/ScreensByMachineViewModel.cs
index 06d7e27e..7c610914 100644
--- a/cicm_web/Areas/Admin/Models/ScreensByMachineViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/ScreensByMachineViewModel.cs
@@ -28,7 +28,7 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class ScreensByMachineViewModel : BaseViewModel<long>
     {
diff --git a/cicm_web/Areas/Admin/Models/SoundByMachineViewModel.cs b/cicm_web/Areas/Admin/Models/SoundByMachineViewModel.cs
index a35d05e5..50863741 100644
--- a/cicm_web/Areas/Admin/Models/SoundByMachineViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/SoundByMachineViewModel.cs
@@ -30,7 +30,7 @@
 
 using System.ComponentModel;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class SoundByMachineViewModel : BaseViewModel<long>
     {
diff --git a/cicm_web/Areas/Admin/Models/SoundSynthViewModel.cs b/cicm_web/Areas/Admin/Models/SoundSynthViewModel.cs
index c2877056..35b6a791 100644
--- a/cicm_web/Areas/Admin/Models/SoundSynthViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/SoundSynthViewModel.cs
@@ -33,7 +33,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class SoundSynthViewModel : BaseViewModel<int>
 
diff --git a/cicm_web/Areas/Admin/Models/StorageByMachineViewModel.cs b/cicm_web/Areas/Admin/Models/StorageByMachineViewModel.cs
index 7f6f467b..2ce706f8 100644
--- a/cicm_web/Areas/Admin/Models/StorageByMachineViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/StorageByMachineViewModel.cs
@@ -30,7 +30,7 @@
 
 using Marechai.Database;
 
-namespace cicm_web.Areas.Admin.Models
+namespace Marechai.Areas.Admin.Models
 {
     public class StorageByMachineViewModel : BaseViewModel<long>
     {
diff --git a/cicm_web/Areas/Admin/Views/Companies/Index.cshtml b/cicm_web/Areas/Admin/Views/Companies/Index.cshtml
index 4c59b336..1e707c4a 100644
--- a/cicm_web/Areas/Admin/Views/Companies/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/Companies/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using CompanyViewModel = cicm_web.Areas.Admin.Models.CompanyViewModel
-@model IEnumerable<cicm_web.Areas.Admin.Models.CompanyViewModel>
+@using CompanyViewModel = Marechai.Areas.Admin.Models.CompanyViewModel
+@model IEnumerable<Marechai.Areas.Admin.Models.CompanyViewModel>
 
 @{
     ViewData["Title"] = "Companies (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/CompanyDescriptions/Index.cshtml b/cicm_web/Areas/Admin/Views/CompanyDescriptions/Index.cshtml
index e0550e8a..56415770 100644
--- a/cicm_web/Areas/Admin/Views/CompanyDescriptions/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/CompanyDescriptions/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.CompanyDescriptionViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.CompanyDescriptionViewModel>
 
 @{
     ViewData["Title"] = "Company descriptions (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml b/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml
index de94c2e3..3e6788d5 100644
--- a/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml
@@ -1,5 +1,5 @@
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.CompanyLogoViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.CompanyLogoViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/DocumentCompanies/Delete.cshtml b/cicm_web/Areas/Admin/Views/DocumentCompanies/Delete.cshtml
index d61bf566..ee4ca2cf 100644
--- a/cicm_web/Areas/Admin/Views/DocumentCompanies/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/DocumentCompanies/Delete.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.DocumentCompanyViewModel
+@model Marechai.Areas.Admin.Models.DocumentCompanyViewModel
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/cicm_web/Areas/Admin/Views/DocumentCompanies/Details.cshtml b/cicm_web/Areas/Admin/Views/DocumentCompanies/Details.cshtml
index a5137ab6..7ee4faec 100644
--- a/cicm_web/Areas/Admin/Views/DocumentCompanies/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/DocumentCompanies/Details.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.DocumentCompanyViewModel
+@model Marechai.Areas.Admin.Models.DocumentCompanyViewModel
 
 @{
     ViewData["Title"] = "Details";
diff --git a/cicm_web/Areas/Admin/Views/DocumentCompanies/Index.cshtml b/cicm_web/Areas/Admin/Views/DocumentCompanies/Index.cshtml
index 0bea7689..c1abf5d2 100644
--- a/cicm_web/Areas/Admin/Views/DocumentCompanies/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/DocumentCompanies/Index.cshtml
@@ -1,5 +1,5 @@
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.DocumentCompanyViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.DocumentCompanyViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/DocumentPeople/Index.cshtml b/cicm_web/Areas/Admin/Views/DocumentPeople/Index.cshtml
index 450c9347..5ca15626 100644
--- a/cicm_web/Areas/Admin/Views/DocumentPeople/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/DocumentPeople/Index.cshtml
@@ -1,5 +1,5 @@
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.DocumentPersonViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.DocumentPersonViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml b/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml
index e6596bb8..6ed73a6a 100644
--- a/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.GpuViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.GpuViewModel>
 
 @{
     ViewData["Title"] = "GPUs (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/GpusByMachine/Index.cshtml b/cicm_web/Areas/Admin/Views/GpusByMachine/Index.cshtml
index 47177744..21a1c23c 100644
--- a/cicm_web/Areas/Admin/Views/GpusByMachine/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/GpusByMachine/Index.cshtml
@@ -1,5 +1,5 @@
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.GpusByMachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.GpusByMachineViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Delete.cshtml b/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Delete.cshtml
index e5846f46..e225a807 100644
--- a/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Delete.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.GpusByMachineViewModel
+@model Marechai.Areas.Admin.Models.GpusByMachineViewModel
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Details.cshtml b/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Details.cshtml
index a9d36379..0c9610e1 100644
--- a/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Details.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.GpusByMachineViewModel
+@model Marechai.Areas.Admin.Models.GpusByMachineViewModel
 
 @{
     ViewData["Title"] = "Details";
diff --git a/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Index.cshtml b/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Index.cshtml
index 47177744..21a1c23c 100644
--- a/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/GpusByOwnedMachine/Index.cshtml
@@ -1,5 +1,5 @@
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.GpusByMachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.GpusByMachineViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/InstructionSetExtensionsByProcessor/Index.cshtml b/cicm_web/Areas/Admin/Views/InstructionSetExtensionsByProcessor/Index.cshtml
index fa70b411..3c001de9 100644
--- a/cicm_web/Areas/Admin/Views/InstructionSetExtensionsByProcessor/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/InstructionSetExtensionsByProcessor/Index.cshtml
@@ -1,5 +1,5 @@
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.InstructionSetExtensionsByProcessorViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.InstructionSetExtensionsByProcessorViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml b/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml
index f2a5c78f..d4a85897 100644
--- a/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.MachineFamilyViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.MachineFamilyViewModel>
 
 @{
     ViewData["Title"] = "Machine families (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/MachinePhotos/Create.cshtml b/cicm_web/Areas/Admin/Views/MachinePhotos/Create.cshtml
index e459a230..c4f09a48 100644
--- a/cicm_web/Areas/Admin/Views/MachinePhotos/Create.cshtml
+++ b/cicm_web/Areas/Admin/Views/MachinePhotos/Create.cshtml
@@ -1,6 +1,6 @@
 @using Marechai.Database.Models
 @using Microsoft.AspNetCore.Identity
-@model cicm_web.Areas.Admin.Models.MachinePhotoViewModel
+@model Marechai.Areas.Admin.Models.MachinePhotoViewModel
 @inject UserManager<ApplicationUser> UserManager
 
 @{
diff --git a/cicm_web/Areas/Admin/Views/MachinePhotos/Delete.cshtml b/cicm_web/Areas/Admin/Views/MachinePhotos/Delete.cshtml
index 132204a0..fca96fda 100644
--- a/cicm_web/Areas/Admin/Views/MachinePhotos/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/MachinePhotos/Delete.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.MachinePhotoViewModel
+@model Marechai.Areas.Admin.Models.MachinePhotoViewModel
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/cicm_web/Areas/Admin/Views/MachinePhotos/Details.cshtml b/cicm_web/Areas/Admin/Views/MachinePhotos/Details.cshtml
index 480b0186..25ef9b74 100644
--- a/cicm_web/Areas/Admin/Views/MachinePhotos/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/MachinePhotos/Details.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.MachinePhotoDetailsViewModel
+@model Marechai.Areas.Admin.Models.MachinePhotoDetailsViewModel
 
 @{
     ViewData["Title"] = "Details";
diff --git a/cicm_web/Areas/Admin/Views/MachinePhotos/Index.cshtml b/cicm_web/Areas/Admin/Views/MachinePhotos/Index.cshtml
index 995dbd23..0deb1679 100644
--- a/cicm_web/Areas/Admin/Views/MachinePhotos/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/MachinePhotos/Index.cshtml
@@ -1,5 +1,5 @@
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.MachinePhotoViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.MachinePhotoViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/Machines/Index.cshtml b/cicm_web/Areas/Admin/Views/Machines/Index.cshtml
index 1ba3d255..cb6c4164 100644
--- a/cicm_web/Areas/Admin/Views/Machines/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/Machines/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.MachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.MachineViewModel>
 
 @{
     ViewData["Title"] = "Machines (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/MemoryByMachines/Index.cshtml b/cicm_web/Areas/Admin/Views/MemoryByMachines/Index.cshtml
index 939020d6..4a6f58f1 100644
--- a/cicm_web/Areas/Admin/Views/MemoryByMachines/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/MemoryByMachines/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.MemoryByMachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.MemoryByMachineViewModel>
 
 @{
     ViewData["Title"] = "Memory by machines (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/MemoryByOwnedMachines/Details.cshtml b/cicm_web/Areas/Admin/Views/MemoryByOwnedMachines/Details.cshtml
index a2f81b6f..6fae163a 100644
--- a/cicm_web/Areas/Admin/Views/MemoryByOwnedMachines/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/MemoryByOwnedMachines/Details.cshtml
@@ -29,7 +29,7 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@model cicm_web.Areas.Admin.Models.MemoryByMachineViewModel
+@model Marechai.Areas.Admin.Models.MemoryByMachineViewModel
 
 @{
     ViewData["Title"] = "Details";
diff --git a/cicm_web/Areas/Admin/Views/MemoryByOwnedMachines/Index.cshtml b/cicm_web/Areas/Admin/Views/MemoryByOwnedMachines/Index.cshtml
index 939020d6..4a6f58f1 100644
--- a/cicm_web/Areas/Admin/Views/MemoryByOwnedMachines/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/MemoryByOwnedMachines/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.MemoryByMachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.MemoryByMachineViewModel>
 
 @{
     ViewData["Title"] = "Memory by machines (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/OwnedMachine/Delete.cshtml b/cicm_web/Areas/Admin/Views/OwnedMachine/Delete.cshtml
index aa9e4b8e..007de011 100644
--- a/cicm_web/Areas/Admin/Views/OwnedMachine/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/OwnedMachine/Delete.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.OwnedMachineViewModel
+@model Marechai.Areas.Admin.Models.OwnedMachineViewModel
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/cicm_web/Areas/Admin/Views/OwnedMachine/Details.cshtml b/cicm_web/Areas/Admin/Views/OwnedMachine/Details.cshtml
index 5aaefbf6..d12ed197 100644
--- a/cicm_web/Areas/Admin/Views/OwnedMachine/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/OwnedMachine/Details.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.OwnedMachineViewModel
+@model Marechai.Areas.Admin.Models.OwnedMachineViewModel
 
 @{
     ViewData["Title"] = "Details";
diff --git a/cicm_web/Areas/Admin/Views/OwnedMachine/Index.cshtml b/cicm_web/Areas/Admin/Views/OwnedMachine/Index.cshtml
index 61071530..483110cc 100644
--- a/cicm_web/Areas/Admin/Views/OwnedMachine/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/OwnedMachine/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<cicm_web.Areas.Admin.Models.OwnedMachineViewModel>
+@model IEnumerable<Marechai.Areas.Admin.Models.OwnedMachineViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/Processors/Index.cshtml b/cicm_web/Areas/Admin/Views/Processors/Index.cshtml
index c7853acd..2c2798d6 100644
--- a/cicm_web/Areas/Admin/Views/Processors/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/Processors/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.ProcessorViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.ProcessorViewModel>
 
 @{
     ViewData["Title"] = "Processors (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Index.cshtml b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Index.cshtml
index 6a95f2a6..000f9abd 100644
--- a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.ProcessorsByMachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.ProcessorsByMachineViewModel>
 
 @{
     ViewData["Title"] = "Processors by machine (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Delete.cshtml b/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Delete.cshtml
index e974d2d3..af447b0f 100644
--- a/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Delete.cshtml
@@ -29,7 +29,7 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@model cicm_web.Areas.Admin.Models.ProcessorsByMachineViewModel
+@model Marechai.Areas.Admin.Models.ProcessorsByMachineViewModel
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Details.cshtml b/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Details.cshtml
index a76caa7b..047eb449 100644
--- a/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Details.cshtml
@@ -29,7 +29,7 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@model cicm_web.Areas.Admin.Models.ProcessorsByMachineViewModel
+@model Marechai.Areas.Admin.Models.ProcessorsByMachineViewModel
 
 @{
     ViewData["Title"] = "Details";
diff --git a/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Index.cshtml b/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Index.cshtml
index 6a95f2a6..000f9abd 100644
--- a/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/ProcessorsByOwnedMachines/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.ProcessorsByMachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.ProcessorsByMachineViewModel>
 
 @{
     ViewData["Title"] = "Processors by machine (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/ResolutionsByGpu/Index.cshtml b/cicm_web/Areas/Admin/Views/ResolutionsByGpu/Index.cshtml
index 9dbcd394..062dde3c 100644
--- a/cicm_web/Areas/Admin/Views/ResolutionsByGpu/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/ResolutionsByGpu/Index.cshtml
@@ -1,5 +1,5 @@
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.ResolutionsByGpuViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.ResolutionsByGpuViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/ScreensByMachine/Delete.cshtml b/cicm_web/Areas/Admin/Views/ScreensByMachine/Delete.cshtml
index 3355d9a3..bab7aa0f 100644
--- a/cicm_web/Areas/Admin/Views/ScreensByMachine/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/ScreensByMachine/Delete.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.ScreensByMachineViewModel
+@model Marechai.Areas.Admin.Models.ScreensByMachineViewModel
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/cicm_web/Areas/Admin/Views/ScreensByMachine/Details.cshtml b/cicm_web/Areas/Admin/Views/ScreensByMachine/Details.cshtml
index 76e5743e..3fa6bdba 100644
--- a/cicm_web/Areas/Admin/Views/ScreensByMachine/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/ScreensByMachine/Details.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.ScreensByMachineViewModel
+@model Marechai.Areas.Admin.Models.ScreensByMachineViewModel
 
 @{
     ViewData["Title"] = "Details";
diff --git a/cicm_web/Areas/Admin/Views/ScreensByMachine/Index.cshtml b/cicm_web/Areas/Admin/Views/ScreensByMachine/Index.cshtml
index 8d817f5c..24c354ca 100644
--- a/cicm_web/Areas/Admin/Views/ScreensByMachine/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/ScreensByMachine/Index.cshtml
@@ -1,5 +1,5 @@
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.ScreensByMachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.ScreensByMachineViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/SoundByMachine/Index.cshtml b/cicm_web/Areas/Admin/Views/SoundByMachine/Index.cshtml
index 67785590..86953b29 100644
--- a/cicm_web/Areas/Admin/Views/SoundByMachine/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/SoundByMachine/Index.cshtml
@@ -1,5 +1,5 @@
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.SoundByMachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.SoundByMachineViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Delete.cshtml b/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Delete.cshtml
index 41fa0c34..4a1afa84 100644
--- a/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Delete.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.SoundByMachineViewModel
+@model Marechai.Areas.Admin.Models.SoundByMachineViewModel
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Details.cshtml b/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Details.cshtml
index 7a936f04..aba05415 100644
--- a/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Details.cshtml
@@ -1,4 +1,4 @@
-@model cicm_web.Areas.Admin.Models.SoundByMachineViewModel
+@model Marechai.Areas.Admin.Models.SoundByMachineViewModel
 
 @{
     ViewData["Title"] = "Details";
diff --git a/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Index.cshtml b/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Index.cshtml
index 67785590..86953b29 100644
--- a/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/SoundByOwnedMachine/Index.cshtml
@@ -1,5 +1,5 @@
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.SoundByMachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.SoundByMachineViewModel>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/cicm_web/Areas/Admin/Views/SoundSynths/Index.cshtml b/cicm_web/Areas/Admin/Views/SoundSynths/Index.cshtml
index 17c55bbc..a8b00254 100644
--- a/cicm_web/Areas/Admin/Views/SoundSynths/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/SoundSynths/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.SoundSynthViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.SoundSynthViewModel>
 
 @{
     ViewData["Title"] = "Sound synthetizers (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/StorageByMachines/Index.cshtml b/cicm_web/Areas/Admin/Views/StorageByMachines/Index.cshtml
index ae68dc1d..b194d773 100644
--- a/cicm_web/Areas/Admin/Views/StorageByMachines/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/StorageByMachines/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.StorageByMachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.StorageByMachineViewModel>
 
 @{
     ViewData["Title"] = "Storage by machines (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Delete.cshtml b/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Delete.cshtml
index d88d724f..01eacba0 100644
--- a/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Delete.cshtml
@@ -29,7 +29,7 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@model cicm_web.Areas.Admin.Models.StorageByMachineViewModel
+@model Marechai.Areas.Admin.Models.StorageByMachineViewModel
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Details.cshtml b/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Details.cshtml
index 625bc10b..928bf070 100644
--- a/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Details.cshtml
@@ -29,7 +29,7 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@model cicm_web.Areas.Admin.Models.StorageByMachineViewModel
+@model Marechai.Areas.Admin.Models.StorageByMachineViewModel
 
 @{
     ViewData["Title"] = "Details";
diff --git a/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Index.cshtml b/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Index.cshtml
index ae68dc1d..b194d773 100644
--- a/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/StorageByOwnedMachines/Index.cshtml
@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using cicm_web.Areas.Admin.Models
-@model IEnumerable<cicm_web.Areas.Admin.Models.StorageByMachineViewModel>
+@using Marechai.Areas.Admin.Models
+@model IEnumerable<Marechai.Areas.Admin.Models.StorageByMachineViewModel>
 
 @{
     ViewData["Title"] = "Storage by machines (Admin)";
diff --git a/cicm_web/Areas/Admin/Views/_ViewImports.cshtml b/cicm_web/Areas/Admin/Views/_ViewImports.cshtml
index 344569c0..a0d31709 100644
--- a/cicm_web/Areas/Admin/Views/_ViewImports.cshtml
+++ b/cicm_web/Areas/Admin/Views/_ViewImports.cshtml
@@ -30,6 +30,6 @@
 *******************************************************************************/
 }
 
-@using cicm_web
-@using cicm_web.Models
+@using Marechai
+@using Marechai.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/cicm_web/Areas/Api/Controllers/CompaniesController.cs b/cicm_web/Areas/Api/Controllers/CompaniesController.cs
index 0975301a..59c1d4d7 100644
--- a/cicm_web/Areas/Api/Controllers/CompaniesController.cs
+++ b/cicm_web/Areas/Api/Controllers/CompaniesController.cs
@@ -33,7 +33,7 @@ using System.Threading.Tasks;
 using Marechai.Database.Models;
 using Microsoft.AspNetCore.Mvc;
 
-namespace cicm_web.Areas.Api.Controllers
+namespace Marechai.Areas.Api.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
diff --git a/cicm_web/Areas/Api/Controllers/MachinesController.cs b/cicm_web/Areas/Api/Controllers/MachinesController.cs
index dd413c62..524d72eb 100644
--- a/cicm_web/Areas/Api/Controllers/MachinesController.cs
+++ b/cicm_web/Areas/Api/Controllers/MachinesController.cs
@@ -33,7 +33,7 @@ using System.Threading.Tasks;
 using Marechai.Database.Models;
 using Microsoft.AspNetCore.Mvc;
 
-namespace cicm_web.Areas.Api.Controllers
+namespace Marechai.Areas.Api.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
diff --git a/cicm_web/Areas/Api/Controllers/NewsController.cs b/cicm_web/Areas/Api/Controllers/NewsController.cs
index be3b3a3b..dc1d2d44 100644
--- a/cicm_web/Areas/Api/Controllers/NewsController.cs
+++ b/cicm_web/Areas/Api/Controllers/NewsController.cs
@@ -33,7 +33,7 @@ using System.Threading.Tasks;
 using Marechai.Database.Models;
 using Microsoft.AspNetCore.Mvc;
 
-namespace cicm_web.Areas.Api.Controllers
+namespace Marechai.Areas.Api.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
diff --git a/cicm_web/Areas/Identity/IdentityHostingStartup.cs b/cicm_web/Areas/Identity/IdentityHostingStartup.cs
index 77bb7b3d..4a6b4529 100644
--- a/cicm_web/Areas/Identity/IdentityHostingStartup.cs
+++ b/cicm_web/Areas/Identity/IdentityHostingStartup.cs
@@ -29,13 +29,13 @@
 *******************************************************************************/
 
 using Marechai.Database.Models;
-using cicm_web.Areas.Identity;
+using Marechai.Areas.Identity;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 
 [assembly: HostingStartup(typeof(IdentityHostingStartup))]
 
-namespace cicm_web.Areas.Identity
+namespace Marechai.Areas.Identity
 {
     public class IdentityHostingStartup : IHostingStartup
     {
diff --git a/cicm_web/Controllers/CompanyController.cs b/cicm_web/Controllers/CompanyController.cs
index 55505fef..c3f42bf2 100644
--- a/cicm_web/Controllers/CompanyController.cs
+++ b/cicm_web/Controllers/CompanyController.cs
@@ -30,12 +30,12 @@
 
 using System.Linq;
 using Marechai.Database.Models;
-using cicm_web.Models;
+using Marechai.Models;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace cicm_web.Controllers
+namespace Marechai.Controllers
 {
     public class CompanyController : Controller
     {
diff --git a/cicm_web/Controllers/ComputerController.cs b/cicm_web/Controllers/ComputerController.cs
index df5e098c..8a69ef4a 100644
--- a/cicm_web/Controllers/ComputerController.cs
+++ b/cicm_web/Controllers/ComputerController.cs
@@ -34,7 +34,7 @@ using Marechai.Database.Models;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 
-namespace cicm_web.Controllers
+namespace Marechai.Controllers
 {
     public class ComputerController : Controller
     {
diff --git a/cicm_web/Controllers/ConsoleController.cs b/cicm_web/Controllers/ConsoleController.cs
index 02b691be..93002ff9 100644
--- a/cicm_web/Controllers/ConsoleController.cs
+++ b/cicm_web/Controllers/ConsoleController.cs
@@ -34,7 +34,7 @@ using Marechai.Database.Models;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 
-namespace cicm_web.Controllers
+namespace Marechai.Controllers
 {
     public class ConsoleController : Controller
     {
diff --git a/cicm_web/Controllers/HomeController.cs b/cicm_web/Controllers/HomeController.cs
index a197f909..901c671c 100644
--- a/cicm_web/Controllers/HomeController.cs
+++ b/cicm_web/Controllers/HomeController.cs
@@ -33,11 +33,11 @@ using System.Diagnostics;
 using System.Linq;
 using Marechai.Database;
 using Marechai.Database.Models;
-using cicm_web.Models;
+using Marechai.Models;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 
-namespace cicm_web.Controllers
+namespace Marechai.Controllers
 {
     public class HomeController : Controller
     {
diff --git a/cicm_web/Controllers/MachineController.cs b/cicm_web/Controllers/MachineController.cs
index 1e74c804..799ec842 100644
--- a/cicm_web/Controllers/MachineController.cs
+++ b/cicm_web/Controllers/MachineController.cs
@@ -33,7 +33,7 @@ using Marechai.Database.Models;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 
-namespace cicm_web.Controllers
+namespace Marechai.Controllers
 {
     public class MachineController : Controller
     {
diff --git a/cicm_web/Helpers/AddPhoto.cs b/cicm_web/Helpers/AddPhoto.cs
index 53711adb..2edf9688 100644
--- a/cicm_web/Helpers/AddPhoto.cs
+++ b/cicm_web/Helpers/AddPhoto.cs
@@ -13,7 +13,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 using SkiaSharp;
 
-namespace cicm_web.Helpers
+namespace Marechai.Helpers
 {
     public class Photos
     {
diff --git a/cicm_web/Helpers/Iso639.cs b/cicm_web/Helpers/Iso639.cs
index 7142175f..d100ca73 100644
--- a/cicm_web/Helpers/Iso639.cs
+++ b/cicm_web/Helpers/Iso639.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using Marechai.Database.Models;
 
-namespace cicm_web.Helpers
+namespace Marechai.Helpers
 {
     public static class Iso639
     {
diff --git a/cicm_web/Helpers/SvgRender.cs b/cicm_web/Helpers/SvgRender.cs
index 516a4d97..fb83ed9f 100644
--- a/cicm_web/Helpers/SvgRender.cs
+++ b/cicm_web/Helpers/SvgRender.cs
@@ -34,7 +34,7 @@ using Marechai.Database.Models;
 using SkiaSharp;
 using SKSvg = SkiaSharp.Extended.Svg.SKSvg;
 
-namespace cicm_web.Helpers
+namespace Marechai.Helpers
 {
     public static class SvgRender
     {
diff --git a/cicm_web/Models/CompanyViewModel.cs b/cicm_web/Models/CompanyViewModel.cs
index 92bbd674..d3ce7eab 100644
--- a/cicm_web/Models/CompanyViewModel.cs
+++ b/cicm_web/Models/CompanyViewModel.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace cicm_web.Models
+namespace Marechai.Models
 {
     public class CompanyViewModel
     {
diff --git a/cicm_web/Models/ErrorViewModel.cs b/cicm_web/Models/ErrorViewModel.cs
index 7f58d6cc..c8aa9117 100644
--- a/cicm_web/Models/ErrorViewModel.cs
+++ b/cicm_web/Models/ErrorViewModel.cs
@@ -28,7 +28,7 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 
-namespace cicm_web.Models
+namespace Marechai.Models
 {
     public class ErrorViewModel
     {
diff --git a/cicm_web/Models/NewsModel.cs b/cicm_web/Models/NewsModel.cs
index 373e0662..ab409afc 100644
--- a/cicm_web/Models/NewsModel.cs
+++ b/cicm_web/Models/NewsModel.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace cicm_web.Models
+namespace Marechai.Models
 {
     public class NewsModel
     {
diff --git a/cicm_web/Program.cs b/cicm_web/Program.cs
index af95f72d..221ea2fc 100644
--- a/cicm_web/Program.cs
+++ b/cicm_web/Program.cs
@@ -32,17 +32,17 @@ using System;
 using System.Linq;
 using Marechai.Database;
 using Marechai.Database.Models;
-using cicm_web.Helpers;
 using DiscImageChef.Interop;
+using Marechai.Helpers;
 using Markdig;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Iso639 = cicm_web.Helpers.Iso639;
+using Iso639 = Marechai.Helpers.Iso639;
 using Version = DiscImageChef.Interop.Version;
 
-namespace cicm_web
+namespace Marechai
 {
     public static class Program
     {
diff --git a/cicm_web/Startup.cs b/cicm_web/Startup.cs
index 685bd23b..c04891e3 100644
--- a/cicm_web/Startup.cs
+++ b/cicm_web/Startup.cs
@@ -36,7 +36,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace cicm_web
+namespace Marechai
 {
     // DO NOT MAKE STATIC
     public class Startup
diff --git a/cicm_web/Views/_ViewImports.cshtml b/cicm_web/Views/_ViewImports.cshtml
index 344569c0..a0d31709 100644
--- a/cicm_web/Views/_ViewImports.cshtml
+++ b/cicm_web/Views/_ViewImports.cshtml
@@ -30,6 +30,6 @@
 *******************************************************************************/
 }
 
-@using cicm_web
-@using cicm_web.Models
+@using Marechai
+@using Marechai.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index 4cde120b..18a1779a 100644
--- a/cicm_web/cicm_web.csproj
+++ b/cicm_web/cicm_web.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>3.0.99.886</Version>
+    <Version>3.0.99.888</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>