diff --git a/src/InternshipSystem.Core/Address.cs b/src/InternshipSystem.Repository/Model/Address.cs
similarity index 100%
rename from src/InternshipSystem.Core/Address.cs
rename to src/InternshipSystem.Repository/Model/Address.cs
diff --git a/src/InternshipSystem.Core/BranchOffice.cs b/src/InternshipSystem.Repository/Model/BranchOffice.cs
similarity index 100%
rename from src/InternshipSystem.Core/BranchOffice.cs
rename to src/InternshipSystem.Repository/Model/BranchOffice.cs
diff --git a/src/InternshipSystem.Core/Company.cs b/src/InternshipSystem.Repository/Model/Company.cs
similarity index 100%
rename from src/InternshipSystem.Core/Company.cs
rename to src/InternshipSystem.Repository/Model/Company.cs
diff --git a/src/InternshipSystem.Core/Course.cs b/src/InternshipSystem.Repository/Model/Course.cs
similarity index 100%
rename from src/InternshipSystem.Core/Course.cs
rename to src/InternshipSystem.Repository/Model/Course.cs
diff --git a/src/InternshipSystem.Core/DeanAcceptance.cs b/src/InternshipSystem.Repository/Model/DeanAcceptance.cs
similarity index 100%
rename from src/InternshipSystem.Core/DeanAcceptance.cs
rename to src/InternshipSystem.Repository/Model/DeanAcceptance.cs
diff --git a/src/InternshipSystem.Core/Edition.cs b/src/InternshipSystem.Repository/Model/Edition.cs
similarity index 86%
rename from src/InternshipSystem.Core/Edition.cs
rename to src/InternshipSystem.Repository/Model/Edition.cs
index 05aefb5..6e237a9 100644
--- a/src/InternshipSystem.Core/Edition.cs
+++ b/src/InternshipSystem.Repository/Model/Edition.cs
@@ -9,7 +9,6 @@ namespace InternshipSystem.Core
         public DateTime StartDate { get; set; }
         public DateTime EndDate { get; set; }
         public DateTime IPPDeadlineDate { get; set; }
-        public List<InternshipProgramEntry> Subjects { get; set;}
-        public List<Internship> Internships { get; set; }
+        public List<InternshipProgramEntry> Subjects { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/InternshipSystem.Core/Insurance.cs b/src/InternshipSystem.Repository/Model/Insurance.cs
similarity index 100%
rename from src/InternshipSystem.Core/Insurance.cs
rename to src/InternshipSystem.Repository/Model/Insurance.cs
diff --git a/src/InternshipSystem.Core/Intern.cs b/src/InternshipSystem.Repository/Model/Intern.cs
similarity index 100%
rename from src/InternshipSystem.Core/Intern.cs
rename to src/InternshipSystem.Repository/Model/Intern.cs
diff --git a/src/InternshipSystem.Core/Internship.cs b/src/InternshipSystem.Repository/Model/Internship.cs
similarity index 100%
rename from src/InternshipSystem.Core/Internship.cs
rename to src/InternshipSystem.Repository/Model/Internship.cs
diff --git a/src/InternshipSystem.Core/InternshipProgramEntry.cs b/src/InternshipSystem.Repository/Model/InternshipProgramEntry.cs
similarity index 100%
rename from src/InternshipSystem.Core/InternshipProgramEntry.cs
rename to src/InternshipSystem.Repository/Model/InternshipProgramEntry.cs
diff --git a/src/InternshipSystem.Core/InternshipType.cs b/src/InternshipSystem.Repository/Model/InternshipType.cs
similarity index 100%
rename from src/InternshipSystem.Core/InternshipType.cs
rename to src/InternshipSystem.Repository/Model/InternshipType.cs
diff --git a/src/InternshipSystem.Core/Mentor.cs b/src/InternshipSystem.Repository/Model/Mentor.cs
similarity index 100%
rename from src/InternshipSystem.Core/Mentor.cs
rename to src/InternshipSystem.Repository/Model/Mentor.cs
diff --git a/src/InternshipSystem.Core/RangeOfActivities.cs b/src/InternshipSystem.Repository/Model/RangeOfActivities.cs
similarity index 100%
rename from src/InternshipSystem.Core/RangeOfActivities.cs
rename to src/InternshipSystem.Repository/Model/RangeOfActivities.cs
diff --git a/src/InternshipSystem.Core/Report.cs b/src/InternshipSystem.Repository/Model/Report.cs
similarity index 100%
rename from src/InternshipSystem.Core/Report.cs
rename to src/InternshipSystem.Repository/Model/Report.cs
diff --git a/test/InternshipSystem.Core.Tests/InternshipSystem.Core.Tests.csproj b/test/InternshipSystem.Core.Tests/InternshipSystem.Core.Tests.csproj
index a689a18..0548e14 100644
--- a/test/InternshipSystem.Core.Tests/InternshipSystem.Core.Tests.csproj
+++ b/test/InternshipSystem.Core.Tests/InternshipSystem.Core.Tests.csproj
@@ -6,10 +6,11 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <Import Project="../../props/Directory.Tests.Build.props"/>
+  <Import Project="../../props/Directory.Tests.Build.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\InternshipSystem.Core\InternshipSystem.Core.csproj" />
+    <ProjectReference Include="..\..\src\InternshipSystem.Repository\InternshipSystem.Repository.csproj" />
   </ItemGroup>
 
 </Project>