23 files changed, 31 insertions, 49 deletions
diff --git a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj
index 0462967..65892c5 100644
--- a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj
+++ b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj
@@ -1,14 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
+  <ItemGroup/>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2"/>
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Web/DevHive.Web.Models/Post/Rating/RatePostWebModel.cs b/src/Web/DevHive.Web.Models/Rating/RatePostWebModel.cs
index 5f0e58f..cbba4ab 100644
--- a/src/Web/DevHive.Web.Models/Post/Rating/RatePostWebModel.cs
+++ b/src/Web/DevHive.Web.Models/Rating/RatePostWebModel.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DevHive.Web.Models.Post.Rating
+namespace DevHive.Web.Models.Rating
 {
 	public class RatePostWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Post/Rating/ReadPostRatingWebModel.cs b/src/Web/DevHive.Web.Models/Rating/ReadPostRatingWebModel.cs
index a551fb8..8afd57e 100644
--- a/src/Web/DevHive.Web.Models/Post/Rating/ReadPostRatingWebModel.cs
+++ b/src/Web/DevHive.Web.Models/Rating/ReadPostRatingWebModel.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DevHive.Web.Models.Post.Rating
+namespace DevHive.Web.Models.Rating
 {
 	public class ReadPostRatingWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Identity/Role/CreateRoleWebModel.cs b/src/Web/DevHive.Web.Models/Role/CreateRoleWebModel.cs
index 859cdd9..9beced4 100644
--- a/src/Web/DevHive.Web.Models/Identity/Role/CreateRoleWebModel.cs
+++ b/src/Web/DevHive.Web.Models/Role/CreateRoleWebModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 
-namespace DevHive.Web.Models.Identity.Role
+namespace DevHive.Web.Models.Role
 {
 	public class CreateRoleWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Identity/Role/RoleWebModel.cs b/src/Web/DevHive.Web.Models/Role/RoleWebModel.cs
index 99b0f50..680fb05 100644
--- a/src/Web/DevHive.Web.Models/Identity/Role/RoleWebModel.cs
+++ b/src/Web/DevHive.Web.Models/Role/RoleWebModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 
-namespace DevHive.Web.Models.Identity.Role
+namespace DevHive.Web.Models.Role
 {
 	public class RoleWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Identity/Role/UpdateRoleWebModel.cs b/src/Web/DevHive.Web.Models/Role/UpdateRoleWebModel.cs
index 3870481..f32839e 100644
--- a/src/Web/DevHive.Web.Models/Identity/Role/UpdateRoleWebModel.cs
+++ b/src/Web/DevHive.Web.Models/Role/UpdateRoleWebModel.cs
@@ -2,7 +2,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 
-namespace DevHive.Web.Models.Identity.Role
+namespace DevHive.Web.Models.Role
 {
 	public class UpdateRoleWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Identity/User/BaseUserWebModel.cs b/src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs
index 297e1a5..9a2544d 100644
--- a/src/Web/DevHive.Web.Models/Identity/User/BaseUserWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs
@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using DevHive.Web.Attributes;
 
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.User
 {
 	public class BaseUserWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Identity/User/LoginWebModel.cs b/src/Web/DevHive.Web.Models/User/LoginWebModel.cs
index ccd806f..c821721 100644
--- a/src/Web/DevHive.Web.Models/Identity/User/LoginWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/LoginWebModel.cs
@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using DevHive.Web.Attributes;
 
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.User
 {
 	public class LoginWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Identity/User/ProfilePictureWebModel.cs b/src/Web/DevHive.Web.Models/User/ProfilePictureWebModel.cs
index 91c9487..e09ee08 100644
--- a/src/Web/DevHive.Web.Models/Identity/User/ProfilePictureWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/ProfilePictureWebModel.cs
@@ -1,4 +1,4 @@
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.User
 {
 	public class ProfilePictureWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Identity/User/RegisterWebModel.cs b/src/Web/DevHive.Web.Models/User/RegisterWebModel.cs
index 0fc7ec6..754c8eb 100644
--- a/src/Web/DevHive.Web.Models/Identity/User/RegisterWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/RegisterWebModel.cs
@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using DevHive.Web.Attributes;
 
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.User
 {
 	public class RegisterWebModel : BaseUserWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Identity/User/TokenWebModel.cs b/src/Web/DevHive.Web.Models/User/TokenWebModel.cs
index 154b64b..7f3361d 100644
--- a/src/Web/DevHive.Web.Models/Identity/User/TokenWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/TokenWebModel.cs
@@ -1,4 +1,4 @@
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.User
 {
 	public class TokenWebModel
 	{
@@ -9,4 +9,4 @@ namespace DevHive.Web.Models.Identity.User
 
 		public string Token { get; set; }
 	}
-}
-\ No newline at end of file
+}
diff --git a/src/Web/DevHive.Web.Models/Identity/User/UpdateProfilePictureWebModel.cs b/src/Web/DevHive.Web.Models/User/UpdateProfilePictureWebModel.cs
index 6efe968..196d1e7 100644
--- a/src/Web/DevHive.Web.Models/Identity/User/UpdateProfilePictureWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/UpdateProfilePictureWebModel.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Http;
 
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.User
 {
 	public class UpdateProfilePictureWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Identity/User/UpdateUserWebModel.cs b/src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs
index 62901f6..86f6bfe 100644
--- a/src/Web/DevHive.Web.Models/Identity/User/UpdateUserWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs
@@ -2,11 +2,11 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using DevHive.Web.Attributes;
-using DevHive.Web.Models.Identity.Role;
+using DevHive.Web.Models.Role;
 using DevHive.Web.Models.Language;
 using DevHive.Web.Models.Technology;
 
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.User
 {
 	public class UpdateUserWebModel : BaseUserWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Identity/User/UserWebModel.cs b/src/Web/DevHive.Web.Models/User/UserWebModel.cs
index 7ab8cca..37141d0 100644
--- a/src/Web/DevHive.Web.Models/Identity/User/UserWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/UserWebModel.cs
@@ -2,11 +2,11 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using DevHive.Common.Models.Misc;
-using DevHive.Web.Models.Identity.Role;
+using DevHive.Web.Models.Role;
 using DevHive.Web.Models.Language;
 using DevHive.Web.Models.Technology;
 
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.User
 {
 	public class UserWebModel : BaseUserWebModel
 	{
diff --git a/src/Web/DevHive.Web.Models/Identity/User/UsernameWebModel.cs b/src/Web/DevHive.Web.Models/User/UsernameWebModel.cs
index c533bba..fc0a7ff 100644
--- a/src/Web/DevHive.Web.Models/Identity/User/UsernameWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/UsernameWebModel.cs
@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using DevHive.Web.Attributes;
 
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.User
 {
 	public class UsernameWebModel
 	{
diff --git a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj
index 2b30bb8..ee390b5 100644
--- a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj
+++ b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj
@@ -13,13 +13,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\DevHive.Web\DevHive.Web.csproj" />
-    <ProjectReference Include="..\DevHive.Web.Models\DevHive.Web.Models.csproj" />
-
-    <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" />
-  </ItemGroup>
-
   <PropertyGroup>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
index 067b4e4..b5deba0 100644
--- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
@@ -3,9 +3,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Services.Interfaces;
-using DevHive.Services.Models.Identity.Role;
+using DevHive.Services.Models.Role;
 using DevHive.Web.Controllers;
-using DevHive.Web.Models.Identity.Role;
+using DevHive.Web.Models.Role;
 using Microsoft.AspNetCore.Mvc;
 using Moq;
 using NUnit.Framework;
diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs
index c1431c8..3e858f6 100644
--- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs
@@ -3,9 +3,9 @@ using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Common.Models.Identity;
 using DevHive.Services.Interfaces;
-using DevHive.Services.Models.Identity.User;
+using DevHive.Services.Models.User;
 using DevHive.Web.Controllers;
-using DevHive.Web.Models.Identity.User;
+using DevHive.Web.Models.User;
 using Microsoft.AspNetCore.Mvc;
 using Moq;
 using NUnit.Framework;
diff --git a/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs b/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs
index 2ea2742..60f8503 100644
--- a/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs
+++ b/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
-using DevHive.Web.Models.Identity.Role;
-using DevHive.Services.Models.Identity.Role;
+using DevHive.Web.Models.Role;
+using DevHive.Services.Models.Role;
 
 namespace DevHive.Web.Configurations.Mapping
 {
diff --git a/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs b/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs
index f58e7ca..14aaa3a 100644
--- a/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs
+++ b/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
-using DevHive.Services.Models.Identity.User;
-using DevHive.Web.Models.Identity.User;
+using DevHive.Services.Models.User;
+using DevHive.Web.Models.User;
 using DevHive.Common.Models.Identity;
 
 namespace DevHive.Web.Configurations.Mapping
diff --git a/src/Web/DevHive.Web/Controllers/RoleController.cs b/src/Web/DevHive.Web/Controllers/RoleController.cs
index 0d2a2eb..1465795 100644
--- a/src/Web/DevHive.Web/Controllers/RoleController.cs
+++ b/src/Web/DevHive.Web/Controllers/RoleController.cs
@@ -1,10 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using DevHive.Web.Models.Identity.Role;
+using DevHive.Web.Models.Role;
 using AutoMapper;
 using System;
 using DevHive.Services.Interfaces;
-using DevHive.Services.Models.Identity.Role;
+using DevHive.Services.Models.Role;
 using Microsoft.AspNetCore.Authorization;
 
 namespace DevHive.Web.Controllers
diff --git a/src/Web/DevHive.Web/Controllers/UserController.cs b/src/Web/DevHive.Web/Controllers/UserController.cs
index 109bbaa..25faa8a 100644
--- a/src/Web/DevHive.Web/Controllers/UserController.cs
+++ b/src/Web/DevHive.Web/Controllers/UserController.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Threading.Tasks;
 using AutoMapper;
-using DevHive.Services.Models.Identity.User;
-using DevHive.Web.Models.Identity.User;
+using DevHive.Services.Models.User;
+using DevHive.Web.Models.User;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using DevHive.Common.Models.Identity;
diff --git a/src/Web/DevHive.Web/DevHive.Web.csproj b/src/Web/DevHive.Web/DevHive.Web.csproj
index 71362ce..7ba07b1 100644
--- a/src/Web/DevHive.Web/DevHive.Web.csproj
+++ b/src/Web/DevHive.Web/DevHive.Web.csproj
@@ -20,11 +20,4 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.1" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\DevHive.Web.Models\DevHive.Web.Models.csproj" />
-
-    <ProjectReference Include="..\DevHive.Services\DevHive.Services.csproj" />
-
-    <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" />
-  </ItemGroup>
 </Project>