diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem.vcxproj b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem.vcxproj
index 34bfc34..d7f333c 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem.vcxproj
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem.vcxproj
@@ -102,7 +102,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)models;$(ProjectDir)controllers;$(ProjectDir)factories;$(ProjectDir)views;$(ProjectDir)services;$(ProjectDir)utilities;$(ProjectDir)core\patterns;$(ProjectDir)datastores;$(ProjectDir)datastores\sharedmemory;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)models;$(ProjectDir)controllers;$(ProjectDir)factories;$(ProjectDir)views;$(ProjectDir)services;$(ProjectDir)utilities;$(ProjectDir)core\patterns;$(ProjectDir)datastores;$(ProjectDir)core\sharedmemory;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -117,7 +117,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)models;$(ProjectDir)controllers;$(ProjectDir)factories;$(ProjectDir)views;$(ProjectDir)services;$(ProjectDir)utilities;$(ProjectDir)core\patterns;$(ProjectDir)datastores;$(ProjectDir)datastores\sharedmemory;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)models;$(ProjectDir)controllers;$(ProjectDir)factories;$(ProjectDir)views;$(ProjectDir)services;$(ProjectDir)utilities;$(ProjectDir)core\patterns;$(ProjectDir)datastores;$(ProjectDir)core\sharedmemory;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -128,8 +128,8 @@
     <ClCompile Include="controllers\Controller.cpp" />
     <ClCompile Include="core\patterns\Observer.cpp" />
     <ClCompile Include="core\patterns\Subject.cpp" />
+    <ClCompile Include="core\sharedmemory\SharedMemory.cpp" />
     <ClCompile Include="datastores\DataStore.cpp" />
-    <ClCompile Include="datastores\sharedmemory\SharedMemory.cpp" />
     <ClCompile Include="models\ComboPackage.cpp" />
     <ClCompile Include="models\InventoryItem.cpp" />
     <ClCompile Include="models\Invoice.cpp" />
@@ -155,14 +155,14 @@
     <ClInclude Include="controllers\Controller.h" />
     <ClInclude Include="core\patterns\Observer.h" />
     <ClInclude Include="core\patterns\Subject.h" />
+    <ClInclude Include="core\sharedmemory\FileHeader.h" />
+    <ClInclude Include="core\sharedmemory\MappingInfo.h" />
+    <ClInclude Include="core\sharedmemory\RecordState.h" />
+    <ClInclude Include="core\sharedmemory\SerializedRecords.h" />
+    <ClInclude Include="core\sharedmemory\SharedMemory.h" />
+    <ClInclude Include="core\sharedmemory\TrackedRecord.h" />
     <ClInclude Include="datastores\DataStore.h" />
     <ClInclude Include="datastores\DataStoreLockGuard.h" />
-    <ClInclude Include="datastores\sharedmemory\FileHeader.h" />
-    <ClInclude Include="datastores\sharedmemory\MappingInfo.h" />
-    <ClInclude Include="datastores\sharedmemory\RecordState.h" />
-    <ClInclude Include="datastores\sharedmemory\SerializedRecords.h" />
-    <ClInclude Include="datastores\sharedmemory\SharedMemory.h" />
-    <ClInclude Include="datastores\sharedmemory\TrackedRecord.h" />
     <ClInclude Include="factories\Factory.h" />
     <ClInclude Include="models\ComboPackage.h" />
     <ClInclude Include="models\InventoryItem.h" />
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem.vcxproj.filters b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem.vcxproj.filters
index c13b320..d354bcb 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem.vcxproj.filters
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem.vcxproj.filters
@@ -64,11 +64,11 @@
     <Filter Include="Source Files\Core\Patterns">
       <UniqueIdentifier>{8057b93d-51a9-42df-b06e-01ce395f6308}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\DataStores\SharedMemory">
-      <UniqueIdentifier>{ec639004-44c6-4bd6-9963-077adde82b5f}</UniqueIdentifier>
+    <Filter Include="Header Files\Core\SharedMemory">
+      <UniqueIdentifier>{d9da9793-fe6f-4914-bee3-99d5934da228}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\DataStores\SharedMemory">
-      <UniqueIdentifier>{7aa8722e-adfa-466e-8211-de63f3b7892b}</UniqueIdentifier>
+    <Filter Include="Source Files\Core\SharedMemory">
+      <UniqueIdentifier>{0769afb6-f57d-4ae3-a1cf-ceca6e606af0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -144,8 +144,8 @@
     <ClCompile Include="models\ComboPackage.cpp">
       <Filter>Source Files\Models</Filter>
     </ClCompile>
-    <ClCompile Include="datastores\sharedmemory\SharedMemory.cpp">
-      <Filter>Source Files\DataStores\SharedMemory</Filter>
+    <ClCompile Include="core\sharedmemory\SharedMemory.cpp">
+      <Filter>Source Files\Core\SharedMemory</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -254,26 +254,26 @@
     <ClInclude Include="views\MenuHelper.h">
       <Filter>Header Files\Views</Filter>
     </ClInclude>
-    <ClInclude Include="datastores\sharedmemory\FileHeader.h">
-      <Filter>Header Files\DataStores\SharedMemory</Filter>
-    </ClInclude>
-    <ClInclude Include="datastores\sharedmemory\MappingInfo.h">
-      <Filter>Header Files\DataStores\SharedMemory</Filter>
-    </ClInclude>
-    <ClInclude Include="datastores\sharedmemory\RecordState.h">
-      <Filter>Header Files\DataStores\SharedMemory</Filter>
-    </ClInclude>
-    <ClInclude Include="datastores\sharedmemory\TrackedRecord.h">
-      <Filter>Header Files\DataStores\SharedMemory</Filter>
-    </ClInclude>
-    <ClInclude Include="datastores\sharedmemory\SerializedRecords.h">
-      <Filter>Header Files\DataStores\SharedMemory</Filter>
-    </ClInclude>
-    <ClInclude Include="datastores\sharedmemory\SharedMemory.h">
-      <Filter>Header Files\DataStores\SharedMemory</Filter>
-    </ClInclude>
     <ClInclude Include="datastores\DataStoreLockGuard.h">
       <Filter>Header Files\DataStores</Filter>
     </ClInclude>
+    <ClInclude Include="core\sharedmemory\FileHeader.h">
+      <Filter>Header Files\Core\SharedMemory</Filter>
+    </ClInclude>
+    <ClInclude Include="core\sharedmemory\MappingInfo.h">
+      <Filter>Header Files\Core\SharedMemory</Filter>
+    </ClInclude>
+    <ClInclude Include="core\sharedmemory\RecordState.h">
+      <Filter>Header Files\Core\SharedMemory</Filter>
+    </ClInclude>
+    <ClInclude Include="core\sharedmemory\SerializedRecords.h">
+      <Filter>Header Files\Core\SharedMemory</Filter>
+    </ClInclude>
+    <ClInclude Include="core\sharedmemory\SharedMemory.h">
+      <Filter>Header Files\Core\SharedMemory</Filter>
+    </ClInclude>
+    <ClInclude Include="core\sharedmemory\TrackedRecord.h">
+      <Filter>Header Files\Core\SharedMemory</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/FileHeader.h b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/FileHeader.h
similarity index 100%
rename from Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/FileHeader.h
rename to Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/FileHeader.h
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/MappingInfo.h b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/MappingInfo.h
similarity index 100%
rename from Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/MappingInfo.h
rename to Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/MappingInfo.h
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/RecordState.h b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/RecordState.h
similarity index 100%
rename from Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/RecordState.h
rename to Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/RecordState.h
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/SerializedRecords.h b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/SerializedRecords.h
similarity index 100%
rename from Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/SerializedRecords.h
rename to Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/SerializedRecords.h
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/SharedMemory.cpp b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/SharedMemory.cpp
similarity index 100%
rename from Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/SharedMemory.cpp
rename to Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/SharedMemory.cpp
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/SharedMemory.h b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/SharedMemory.h
similarity index 100%
rename from Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/SharedMemory.h
rename to Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/SharedMemory.h
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/TrackedRecord.h b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/TrackedRecord.h
similarity index 100%
rename from Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/sharedmemory/TrackedRecord.h
rename to Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/sharedmemory/TrackedRecord.h