29 files changed, 26 insertions, 48 deletions
diff --git a/src/Data/DevHive.Data.Models/Comment.cs b/src/Data/DevHive.Data.Models/Comment.cs
index e2bb21d..10a3aaf 100644
--- a/src/Data/DevHive.Data.Models/Comment.cs
+++ b/src/Data/DevHive.Data.Models/Comment.cs
@@ -1,5 +1,5 @@
 using System;
-using DevHive.Data.Interfaces.Models;
+using DevHive.Data.Models.Interfaces;
 
 namespace DevHive.Data.Models
 {
diff --git a/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj b/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj
index ebf5f9c..628e361 100644
--- a/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj
+++ b/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj
@@ -1,11 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Data/DevHive.Data/Interfaces/Models/IComment.cs b/src/Data/DevHive.Data.Models/Interfaces/IComment.cs
index 97c1578..c8f1f6a 100644
--- a/src/Data/DevHive.Data/Interfaces/Models/IComment.cs
+++ b/src/Data/DevHive.Data.Models/Interfaces/IComment.cs
@@ -1,7 +1,7 @@
 using System;
 using DevHive.Data.Models;
 
-namespace DevHive.Data.Interfaces.Models
+namespace DevHive.Data.Models.Interfaces
 {
 	public interface IComment : IModel
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Models/ILanguage.cs b/src/Data/DevHive.Data.Models/Interfaces/ILanguage.cs
index 9eed09d..06e11b4 100644
--- a/src/Data/DevHive.Data/Interfaces/Models/ILanguage.cs
+++ b/src/Data/DevHive.Data.Models/Interfaces/ILanguage.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using DevHive.Data.Models;
 
-namespace DevHive.Data.Interfaces.Models
+namespace DevHive.Data.Models.Interfaces
 {
 	public interface ILanguage : IModel
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Models/IModel.cs b/src/Data/DevHive.Data.Models/Interfaces/IModel.cs
index f903af3..3226dce 100644
--- a/src/Data/DevHive.Data/Interfaces/Models/IModel.cs
+++ b/src/Data/DevHive.Data.Models/Interfaces/IModel.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DevHive.Data.Interfaces.Models
+namespace DevHive.Data.Models.Interfaces
 {
 	public interface IModel
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Models/IPost.cs b/src/Data/DevHive.Data.Models/Interfaces/IPost.cs
index 712d955..b1f0cb7 100644
--- a/src/Data/DevHive.Data/Interfaces/Models/IPost.cs
+++ b/src/Data/DevHive.Data.Models/Interfaces/IPost.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using DevHive.Data.Models;
 using DevHive.Data.RelationModels;
 
-namespace DevHive.Data.Interfaces.Models
+namespace DevHive.Data.Models.Interfaces
 {
 	public interface IPost : IModel
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Models/IProfilePicture.cs b/src/Data/DevHive.Data.Models/Interfaces/IProfilePicture.cs
index c3fcbea..550af24 100644
--- a/src/Data/DevHive.Data/Interfaces/Models/IProfilePicture.cs
+++ b/src/Data/DevHive.Data.Models/Interfaces/IProfilePicture.cs
@@ -1,7 +1,7 @@
 using System;
 using DevHive.Data.Models;
 
-namespace DevHive.Data.Interfaces.Models
+namespace DevHive.Data.Models.Interfaces
 {
 	public interface IProfilePicture : IModel
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Models/IRating.cs b/src/Data/DevHive.Data.Models/Interfaces/IRating.cs
index d1b968f..1b081b0 100644
--- a/src/Data/DevHive.Data/Interfaces/Models/IRating.cs
+++ b/src/Data/DevHive.Data.Models/Interfaces/IRating.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using DevHive.Data.Models;
 
-namespace DevHive.Data.Interfaces.Models
+namespace DevHive.Data.Models.Interfaces
 {
 	public interface IRating : IModel
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Models/IRole.cs b/src/Data/DevHive.Data.Models/Interfaces/IRole.cs
index c8b7068..3a87e12 100644
--- a/src/Data/DevHive.Data/Interfaces/Models/IRole.cs
+++ b/src/Data/DevHive.Data.Models/Interfaces/IRole.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using DevHive.Data.Models;
 
-namespace DevHive.Data.Interfaces.Models
+namespace DevHive.Data.Models.Interfaces
 {
 	public interface IRole
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Models/ITechnology.cs b/src/Data/DevHive.Data.Models/Interfaces/ITechnology.cs
index 153f75f..575aea6 100644
--- a/src/Data/DevHive.Data/Interfaces/Models/ITechnology.cs
+++ b/src/Data/DevHive.Data.Models/Interfaces/ITechnology.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using DevHive.Data.Models;
 
-namespace DevHive.Data.Interfaces.Models
+namespace DevHive.Data.Models.Interfaces
 {
 	public interface ITechnology : IModel
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Models/IUser.cs b/src/Data/DevHive.Data.Models/Interfaces/IUser.cs
index fcd741c..7606ba2 100644
--- a/src/Data/DevHive.Data/Interfaces/Models/IUser.cs
+++ b/src/Data/DevHive.Data.Models/Interfaces/IUser.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using DevHive.Data.Models;
 using DevHive.Data.RelationModels;
 
-namespace DevHive.Data.Interfaces.Models
+namespace DevHive.Data.Models.Interfaces
 {
 	public interface IUser : IModel
 	{
diff --git a/src/Data/DevHive.Data.Models/Language.cs b/src/Data/DevHive.Data.Models/Language.cs
index 7ad8ff2..fdcfb07 100644
--- a/src/Data/DevHive.Data.Models/Language.cs
+++ b/src/Data/DevHive.Data.Models/Language.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using DevHive.Data.Interfaces.Models;
+using DevHive.Data.Models.Interfaces;
 
 namespace DevHive.Data.Models
 {
diff --git a/src/Data/DevHive.Data.Models/Post.cs b/src/Data/DevHive.Data.Models/Post.cs
index 3f3d8c9..5138d19 100644
--- a/src/Data/DevHive.Data.Models/Post.cs
+++ b/src/Data/DevHive.Data.Models/Post.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using DevHive.Data.Interfaces.Models;
+using DevHive.Data.Models.Interfaces;
 using DevHive.Data.RelationModels;
 
 namespace DevHive.Data.Models
diff --git a/src/Data/DevHive.Data.Models/ProfilePicture.cs b/src/Data/DevHive.Data.Models/ProfilePicture.cs
index d5cc397..c5dec68 100644
--- a/src/Data/DevHive.Data.Models/ProfilePicture.cs
+++ b/src/Data/DevHive.Data.Models/ProfilePicture.cs
@@ -1,5 +1,5 @@
 using System;
-using DevHive.Data.Interfaces.Models;
+using DevHive.Data.Models.Interfaces;
 
 namespace DevHive.Data.Models
 {
diff --git a/src/Data/DevHive.Data.Models/Rating.cs b/src/Data/DevHive.Data.Models/Rating.cs
index e1bedd2..13fdbce 100644
--- a/src/Data/DevHive.Data.Models/Rating.cs
+++ b/src/Data/DevHive.Data.Models/Rating.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using DevHive.Data.Interfaces.Models;
+using DevHive.Data.Models.Interfaces;
 
 namespace DevHive.Data.Models
 {
@@ -11,7 +11,7 @@ namespace DevHive.Data.Models
 		public Guid PostId { get; set; }
 
 		public Post Post { get; set; }
-		
+
 		public int Rate { get; set; }
 	}
 }
diff --git a/src/Data/DevHive.Data.Models/Role.cs b/src/Data/DevHive.Data.Models/Role.cs
index 259d867..0df556c 100644
--- a/src/Data/DevHive.Data.Models/Role.cs
+++ b/src/Data/DevHive.Data.Models/Role.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
-using DevHive.Data.Interfaces.Models;
+using DevHive.Data.Models.Interfaces;
 using Microsoft.AspNetCore.Identity;
 using System;
 
diff --git a/src/Data/DevHive.Data.Models/Technology.cs b/src/Data/DevHive.Data.Models/Technology.cs
index 6f98f0b..9354d5b 100644
--- a/src/Data/DevHive.Data.Models/Technology.cs
+++ b/src/Data/DevHive.Data.Models/Technology.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using DevHive.Data.Interfaces.Models;
+using DevHive.Data.Models.Interfaces;
 
 namespace DevHive.Data.Models
 {
diff --git a/src/Data/DevHive.Data.Models/User.cs b/src/Data/DevHive.Data.Models/User.cs
index 983d073..806397a 100644
--- a/src/Data/DevHive.Data.Models/User.cs
+++ b/src/Data/DevHive.Data.Models/User.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using DevHive.Data.Interfaces.Models;
+using DevHive.Data.Models.Interfaces;
 using DevHive.Data.RelationModels;
 using Microsoft.AspNetCore.Identity;
 
diff --git a/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj b/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj
index 42a3273..d6d0876 100644
--- a/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj
+++ b/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj
@@ -14,14 +14,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\DevHive.Data\DevHive.Data.csproj" />
-
-    <ProjectReference Include="..\DevHive.Data.Models\DevHive.Data.Models.csproj" />
-
-    <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" />
-  </ItemGroup>
-
   <PropertyGroup>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
diff --git a/src/Data/DevHive.Data/DevHive.Data.csproj b/src/Data/DevHive.Data/DevHive.Data.csproj
index 62b61dc..e8f38ee 100644
--- a/src/Data/DevHive.Data/DevHive.Data.csproj
+++ b/src/Data/DevHive.Data/DevHive.Data.csproj
@@ -18,14 +18,6 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
   </ItemGroup>
 
- <ItemGroup>
-   <ProjectReference Include="..\DevHive.Data.Models\DevHive.Data.Models.csproj" />
-
-   <ProjectReference Include="..\DevHive.Data.Tests\DevHive.Data.Tests.csproj" />
-
-   <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" />
- </ItemGroup>
-
   <PropertyGroup>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/ICommentRepository.cs b/src/Data/DevHive.Data/Interfaces/ICommentRepository.cs
index 267f251..f85849f 100644
--- a/src/Data/DevHive.Data/Interfaces/Repositories/ICommentRepository.cs
+++ b/src/Data/DevHive.Data/Interfaces/ICommentRepository.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using DevHive.Data.Models;
 using DevHive.Data.Repositories.Interfaces;
 
-namespace DevHive.Data.Interfaces.Repositories
+namespace DevHive.Data.Interfaces
 {
 	public interface ICommentRepository : IRepository<Comment>
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IFeedRepository.cs b/src/Data/DevHive.Data/Interfaces/IFeedRepository.cs
index 7262510..bda51fa 100644
--- a/src/Data/DevHive.Data/Interfaces/Repositories/IFeedRepository.cs
+++ b/src/Data/DevHive.Data/Interfaces/IFeedRepository.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using DevHive.Data.Models;
 
-namespace DevHive.Data.Interfaces.Repositories
+namespace DevHive.Data.Interfaces
 {
 	public interface IFeedRepository
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/ILanguageRepository.cs b/src/Data/DevHive.Data/Interfaces/ILanguageRepository.cs
index db2949a..4771f91 100644
--- a/src/Data/DevHive.Data/Interfaces/Repositories/ILanguageRepository.cs
+++ b/src/Data/DevHive.Data/Interfaces/ILanguageRepository.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using DevHive.Data.Models;
 using DevHive.Data.Repositories.Interfaces;
 
-namespace DevHive.Data.Interfaces.Repositories
+namespace DevHive.Data.Interfaces
 {
 	public interface ILanguageRepository : IRepository<Language>
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IPostRepository.cs b/src/Data/DevHive.Data/Interfaces/IPostRepository.cs
index 9f7cf85..c24d596 100644
--- a/src/Data/DevHive.Data/Interfaces/Repositories/IPostRepository.cs
+++ b/src/Data/DevHive.Data/Interfaces/IPostRepository.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using DevHive.Data.Models;
 using DevHive.Data.Repositories.Interfaces;
 
-namespace DevHive.Data.Interfaces.Repositories
+namespace DevHive.Data.Interfaces
 {
 	public interface IPostRepository : IRepository<Post>
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IRatingRepository.cs b/src/Data/DevHive.Data/Interfaces/IRatingRepository.cs
index f77f301..b5aff88 100644
--- a/src/Data/DevHive.Data/Interfaces/Repositories/IRatingRepository.cs
+++ b/src/Data/DevHive.Data/Interfaces/IRatingRepository.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using DevHive.Data.Models;
 using DevHive.Data.Repositories.Interfaces;
 
-namespace DevHive.Data.Interfaces.Repositories
+namespace DevHive.Data.Interfaces
 {
 	public interface IRatingRepository : IRepository<Rating>
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IRepository.cs b/src/Data/DevHive.Data/Interfaces/IRepository.cs
index 0d11cd3..0d11cd3 100644
--- a/src/Data/DevHive.Data/Interfaces/Repositories/IRepository.cs
+++ b/src/Data/DevHive.Data/Interfaces/IRepository.cs
diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IRoleRepository.cs b/src/Data/DevHive.Data/Interfaces/IRoleRepository.cs
index e834369..a1080bb 100644
--- a/src/Data/DevHive.Data/Interfaces/Repositories/IRoleRepository.cs
+++ b/src/Data/DevHive.Data/Interfaces/IRoleRepository.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using DevHive.Data.Models;
 using DevHive.Data.Repositories.Interfaces;
 
-namespace DevHive.Data.Interfaces.Repositories
+namespace DevHive.Data.Interfaces
 {
 	public interface IRoleRepository : IRepository<Role>
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/ITechnologyRepository.cs b/src/Data/DevHive.Data/Interfaces/ITechnologyRepository.cs
index 9126bfc..3e55b2d 100644
--- a/src/Data/DevHive.Data/Interfaces/Repositories/ITechnologyRepository.cs
+++ b/src/Data/DevHive.Data/Interfaces/ITechnologyRepository.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using DevHive.Data.Models;
 using DevHive.Data.Repositories.Interfaces;
 
-namespace DevHive.Data.Interfaces.Repositories
+namespace DevHive.Data.Interfaces
 {
 	public interface ITechnologyRepository : IRepository<Technology>
 	{
diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IUserRepository.cs b/src/Data/DevHive.Data/Interfaces/IUserRepository.cs
index 5ebe3d3..917809d 100644
--- a/src/Data/DevHive.Data/Interfaces/Repositories/IUserRepository.cs
+++ b/src/Data/DevHive.Data/Interfaces/IUserRepository.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using DevHive.Data.Models;
 using DevHive.Data.Repositories.Interfaces;
 
-namespace DevHive.Data.Interfaces.Repositories
+namespace DevHive.Data.Interfaces
 {
 	public interface IUserRepository : IRepository<User>
 	{