diff --git a/src/MyWebLog.Tests/CategoryDataTests.fs b/src/MyWebLog.Tests/Data/CategoryDataTests.fs
similarity index 100%
rename from src/MyWebLog.Tests/CategoryDataTests.fs
rename to src/MyWebLog.Tests/Data/CategoryDataTests.fs
diff --git a/src/MyWebLog.Tests/ConvertersTests.fs b/src/MyWebLog.Tests/Data/ConvertersTests.fs
similarity index 100%
rename from src/MyWebLog.Tests/ConvertersTests.fs
rename to src/MyWebLog.Tests/Data/ConvertersTests.fs
diff --git a/src/MyWebLog.Tests/SQLiteDataTests.fs b/src/MyWebLog.Tests/Data/SQLiteDataTests.fs
similarity index 100%
rename from src/MyWebLog.Tests/SQLiteDataTests.fs
rename to src/MyWebLog.Tests/Data/SQLiteDataTests.fs
diff --git a/src/MyWebLog.Tests/UtilsTests.fs b/src/MyWebLog.Tests/Data/UtilsTests.fs
similarity index 100%
rename from src/MyWebLog.Tests/UtilsTests.fs
rename to src/MyWebLog.Tests/Data/UtilsTests.fs
diff --git a/src/MyWebLog.Tests/DataTypesTests.fs b/src/MyWebLog.Tests/Domain/DataTypesTests.fs
similarity index 100%
rename from src/MyWebLog.Tests/DataTypesTests.fs
rename to src/MyWebLog.Tests/Domain/DataTypesTests.fs
diff --git a/src/MyWebLog.Tests/SupportTypesTests.fs b/src/MyWebLog.Tests/Domain/SupportTypesTests.fs
similarity index 100%
rename from src/MyWebLog.Tests/SupportTypesTests.fs
rename to src/MyWebLog.Tests/Domain/SupportTypesTests.fs
diff --git a/src/MyWebLog.Tests/ViewModelsTests.fs b/src/MyWebLog.Tests/Domain/ViewModelsTests.fs
similarity index 100%
rename from src/MyWebLog.Tests/ViewModelsTests.fs
rename to src/MyWebLog.Tests/Domain/ViewModelsTests.fs
diff --git a/src/MyWebLog.Tests/MyWebLog.Tests.fsproj b/src/MyWebLog.Tests/MyWebLog.Tests.fsproj
index 8887ed0..3196b07 100644
--- a/src/MyWebLog.Tests/MyWebLog.Tests.fsproj
+++ b/src/MyWebLog.Tests/MyWebLog.Tests.fsproj
@@ -5,15 +5,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="SupportTypesTests.fs" />
-    <Compile Include="DataTypesTests.fs" />
-    <Compile Include="ViewModelsTests.fs" />
-    <Compile Include="ConvertersTests.fs" />
-    <Compile Include="UtilsTests.fs" />
-    <Compile Include="CategoryDataTests.fs" />
-    <Compile Include="SQLiteDataTests.fs" />
+    <Compile Include="Domain\SupportTypesTests.fs" />
+    <Compile Include="Domain\DataTypesTests.fs" />
+    <Compile Include="Domain\ViewModelsTests.fs" />
+    <Compile Include="Data\ConvertersTests.fs" />
+    <Compile Include="Data\UtilsTests.fs" />
+    <Compile Include="Data\CategoryDataTests.fs" />
+    <Compile Include="Data\SQLiteDataTests.fs" />
     <Compile Include="Program.fs" />
-    <Content Include="root-weblog.json" />
+    <None Include="root-weblog.json" />
   </ItemGroup>
 
   <ItemGroup>