diff --git a/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs b/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs
index 17110c38a6..0aaaf840fe 100644
--- a/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs
@@ -5,6 +5,7 @@
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Datastore.Converters;
+using NzbDrone.Core.Datastore.Extentions;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Test.Datastore
diff --git a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs
index 134572a165..65819a6862 100644
--- a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs
@@ -1,6 +1,7 @@
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Datastore.Extentions;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Test.Datastore.PagingSpecExtenstionsTests
diff --git a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs
index f33805191a..de74a63f20 100644
--- a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs
@@ -1,6 +1,7 @@
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Datastore.Extentions;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Test.Datastore.PagingSpecExtenstionsTests
diff --git a/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs b/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs
index 2b88348aa9..bb49dbfd39 100644
--- a/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs
+++ b/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs
@@ -5,6 +5,7 @@
 using NUnit.Framework;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Datastore.Migration.Framework;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Instrumentation;
 using NzbDrone.Core.Test.Framework;
diff --git a/src/NzbDrone.Core/Datastore/BasicRepository.cs b/src/NzbDrone.Core/Datastore/BasicRepository.cs
index 74354e28f9..68e44343e2 100644
--- a/src/NzbDrone.Core/Datastore/BasicRepository.cs
+++ b/src/NzbDrone.Core/Datastore/BasicRepository.cs
@@ -6,6 +6,7 @@
 using Marr.Data.QGen;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Common;
+using NzbDrone.Core.Datastore.Extentions;
 using NzbDrone.Core.Messaging.Events;
 
 
diff --git a/src/NzbDrone.Core/Datastore/MappingExtensions.cs b/src/NzbDrone.Core/Datastore/Extentions/MappingExtensions.cs
similarity index 97%
rename from src/NzbDrone.Core/Datastore/MappingExtensions.cs
rename to src/NzbDrone.Core/Datastore/Extentions/MappingExtensions.cs
index 509d81bcab..e5a0000043 100644
--- a/src/NzbDrone.Core/Datastore/MappingExtensions.cs
+++ b/src/NzbDrone.Core/Datastore/Extentions/MappingExtensions.cs
@@ -4,7 +4,7 @@
 using Marr.Data.Mapping;
 using NzbDrone.Common.Reflection;
 
-namespace NzbDrone.Core.Datastore
+namespace NzbDrone.Core.Datastore.Extentions
 {
     public static class MappingExtensions
     {
diff --git a/src/NzbDrone.Core/Datastore/PagingSpecExtensions.cs b/src/NzbDrone.Core/Datastore/Extentions/PagingSpecExtensions.cs
similarity index 97%
rename from src/NzbDrone.Core/Datastore/PagingSpecExtensions.cs
rename to src/NzbDrone.Core/Datastore/Extentions/PagingSpecExtensions.cs
index 15f09c6250..d5593876e7 100644
--- a/src/NzbDrone.Core/Datastore/PagingSpecExtensions.cs
+++ b/src/NzbDrone.Core/Datastore/Extentions/PagingSpecExtensions.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace NzbDrone.Core.Datastore
+namespace NzbDrone.Core.Datastore.Extentions
 {
     public static class PagingSpecExtensions
     {
diff --git a/src/NzbDrone.Core/Datastore/RelationshipExtensions.cs b/src/NzbDrone.Core/Datastore/Extentions/RelationshipExtensions.cs
similarity index 97%
rename from src/NzbDrone.Core/Datastore/RelationshipExtensions.cs
rename to src/NzbDrone.Core/Datastore/Extentions/RelationshipExtensions.cs
index 1d82cb6edc..6bade070f4 100644
--- a/src/NzbDrone.Core/Datastore/RelationshipExtensions.cs
+++ b/src/NzbDrone.Core/Datastore/Extentions/RelationshipExtensions.cs
@@ -4,7 +4,7 @@
 using Marr.Data;
 using Marr.Data.Mapping;
 
-namespace NzbDrone.Core.Datastore
+namespace NzbDrone.Core.Datastore.Extentions
 {
     public static class RelationshipExtensions
     {
diff --git a/src/NzbDrone.Core/Datastore/MigrationType.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationType.cs
similarity index 55%
rename from src/NzbDrone.Core/Datastore/MigrationType.cs
rename to src/NzbDrone.Core/Datastore/Migration/Framework/MigrationType.cs
index b572755ccb..eb72b996b5 100644
--- a/src/NzbDrone.Core/Datastore/MigrationType.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationType.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Datastore
+namespace NzbDrone.Core.Datastore.Migration.Framework
 {
     public enum MigrationType
     {
diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs
index 78c6fa0fbe..02c728f220 100644
--- a/src/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/src/NzbDrone.Core/Datastore/TableMapping.cs
@@ -7,6 +7,7 @@
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.DataAugmentation.Scene;
 using NzbDrone.Core.Datastore.Converters;
+using NzbDrone.Core.Datastore.Extentions;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Instrumentation;
diff --git a/src/NzbDrone.Core/History/HistoryRepository.cs b/src/NzbDrone.Core/History/HistoryRepository.cs
index b53c7faca3..3d0070cac9 100644
--- a/src/NzbDrone.Core/History/HistoryRepository.cs
+++ b/src/NzbDrone.Core/History/HistoryRepository.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using Marr.Data.QGen;
 using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Datastore.Extentions;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Tv;
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index 0c22a06480..1c5f6d42d3 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -153,9 +153,11 @@
     <Compile Include="Datastore\DbFactory.cs" />
     <Compile Include="Datastore\Converters\EnumIntConverter.cs" />
     <Compile Include="Datastore\Events\ModelEvent.cs" />
+    <Compile Include="Datastore\Extentions\MappingExtensions.cs" />
+    <Compile Include="Datastore\Extentions\PagingSpecExtensions.cs" />
+    <Compile Include="Datastore\Extentions\RelationshipExtensions.cs" />
     <Compile Include="Datastore\IEmbeddedDocument.cs" />
     <Compile Include="Datastore\LazyList.cs" />
-    <Compile Include="Datastore\MappingExtensions.cs" />
     <Compile Include="Datastore\Migration\002_remove_tvrage_imdb_unique_constraint.cs" />
     <Compile Include="Datastore\Migration\003_remove_clean_title_from_scene_mapping.cs" />
     <Compile Include="Datastore\Migration\004_updated_history.cs" />
@@ -209,8 +211,8 @@
     <Compile Include="Datastore\Migration\Framework\MigrationOptions.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationLogger.cs" />
     <Compile Include="Datastore\Migration\001_initialSetup.cs" />
+    <Compile Include="Datastore\Migration\Framework\MigrationType.cs" />
     <Compile Include="Datastore\Migration\Framework\NzbDroneMigrationBase.cs" />
-    <Compile Include="Datastore\MigrationType.cs" />
     <Compile Include="Datastore\Migration\Framework\SQLiteAlter.cs" />
     <Compile Include="Datastore\Migration\Framework\SQLiteColumn.cs" />
     <Compile Include="Datastore\Migration\Framework\SQLiteIndex.cs" />
@@ -219,8 +221,6 @@
     <Compile Include="Datastore\BasicRepository.cs" />
     <Compile Include="Datastore\ModelNotFoundException.cs" />
     <Compile Include="Datastore\PagingSpec.cs" />
-    <Compile Include="Datastore\PagingSpecExtensions.cs" />
-    <Compile Include="Datastore\RelationshipExtensions.cs" />
     <Compile Include="Datastore\TableMapping.cs" />
     <Compile Include="DecisionEngine\Specifications\BlacklistSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\DownloadDecision.cs" />
diff --git a/src/NzbDrone.Core/Tv/EpisodeRepository.cs b/src/NzbDrone.Core/Tv/EpisodeRepository.cs
index dcbe99e1e2..484ee1d6d0 100644
--- a/src/NzbDrone.Core/Tv/EpisodeRepository.cs
+++ b/src/NzbDrone.Core/Tv/EpisodeRepository.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using Marr.Data.QGen;
 using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Datastore.Extentions;
 using NzbDrone.Core.Messaging.Events;