diff --git a/EDMI.File.Test/EDMI.File.Test.vbproj b/Modules.EDMI.File.Test/EDMI.File.Test.vbproj
similarity index 98%
rename from EDMI.File.Test/EDMI.File.Test.vbproj
rename to Modules.EDMI.File.Test/EDMI.File.Test.vbproj
index 8310ffa6..c269bd8e 100644
--- a/EDMI.File.Test/EDMI.File.Test.vbproj
+++ b/Modules.EDMI.File.Test/EDMI.File.Test.vbproj
@@ -116,7 +116,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\EDMI.File\EDMI.File.vbproj">
+    <ProjectReference Include="..\Modules.EDMI.File\EDMI.File.vbproj">
       <Project>{1477032d-7a02-4c5f-b026-a7117da4bc6b}</Project>
       <Name>EDMI.File</Name>
     </ProjectReference>
diff --git a/EDMI.File.Test/My Project/Application.Designer.vb b/Modules.EDMI.File.Test/My Project/Application.Designer.vb
similarity index 100%
rename from EDMI.File.Test/My Project/Application.Designer.vb
rename to Modules.EDMI.File.Test/My Project/Application.Designer.vb
diff --git a/EDMI.File.Test/My Project/Application.myapp b/Modules.EDMI.File.Test/My Project/Application.myapp
similarity index 100%
rename from EDMI.File.Test/My Project/Application.myapp
rename to Modules.EDMI.File.Test/My Project/Application.myapp
diff --git a/EDMI.File.Test/My Project/AssemblyInfo.vb b/Modules.EDMI.File.Test/My Project/AssemblyInfo.vb
similarity index 100%
rename from EDMI.File.Test/My Project/AssemblyInfo.vb
rename to Modules.EDMI.File.Test/My Project/AssemblyInfo.vb
diff --git a/EDMI.File.Test/My Project/Resources.Designer.vb b/Modules.EDMI.File.Test/My Project/Resources.Designer.vb
similarity index 100%
rename from EDMI.File.Test/My Project/Resources.Designer.vb
rename to Modules.EDMI.File.Test/My Project/Resources.Designer.vb
diff --git a/EDMI.File.Test/My Project/Resources.resx b/Modules.EDMI.File.Test/My Project/Resources.resx
similarity index 100%
rename from EDMI.File.Test/My Project/Resources.resx
rename to Modules.EDMI.File.Test/My Project/Resources.resx
diff --git a/EDMI.File.Test/My Project/Settings.Designer.vb b/Modules.EDMI.File.Test/My Project/Settings.Designer.vb
similarity index 100%
rename from EDMI.File.Test/My Project/Settings.Designer.vb
rename to Modules.EDMI.File.Test/My Project/Settings.Designer.vb
diff --git a/EDMI.File.Test/My Project/Settings.settings b/Modules.EDMI.File.Test/My Project/Settings.settings
similarity index 100%
rename from EDMI.File.Test/My Project/Settings.settings
rename to Modules.EDMI.File.Test/My Project/Settings.settings
diff --git a/EDMI.File.Test/PathTest.vb b/Modules.EDMI.File.Test/PathTest.vb
similarity index 100%
rename from EDMI.File.Test/PathTest.vb
rename to Modules.EDMI.File.Test/PathTest.vb
diff --git a/EDMI.File.Test/packages.config b/Modules.EDMI.File.Test/packages.config
similarity index 100%
rename from EDMI.File.Test/packages.config
rename to Modules.EDMI.File.Test/packages.config
diff --git a/EDMI.File/Archive.vb b/Modules.EDMI.File/Archive.vb
similarity index 100%
rename from EDMI.File/Archive.vb
rename to Modules.EDMI.File/Archive.vb
diff --git a/EDMI.File/EDMI.File.vbproj b/Modules.EDMI.File/EDMI.File.vbproj
similarity index 100%
rename from EDMI.File/EDMI.File.vbproj
rename to Modules.EDMI.File/EDMI.File.vbproj
diff --git a/EDMI.File/My Project/Application.Designer.vb b/Modules.EDMI.File/My Project/Application.Designer.vb
similarity index 100%
rename from EDMI.File/My Project/Application.Designer.vb
rename to Modules.EDMI.File/My Project/Application.Designer.vb
diff --git a/EDMI.File/My Project/Application.myapp b/Modules.EDMI.File/My Project/Application.myapp
similarity index 100%
rename from EDMI.File/My Project/Application.myapp
rename to Modules.EDMI.File/My Project/Application.myapp
diff --git a/EDMI.File/My Project/AssemblyInfo.vb b/Modules.EDMI.File/My Project/AssemblyInfo.vb
similarity index 100%
rename from EDMI.File/My Project/AssemblyInfo.vb
rename to Modules.EDMI.File/My Project/AssemblyInfo.vb
diff --git a/EDMI.File/My Project/Resources.Designer.vb b/Modules.EDMI.File/My Project/Resources.Designer.vb
similarity index 100%
rename from EDMI.File/My Project/Resources.Designer.vb
rename to Modules.EDMI.File/My Project/Resources.Designer.vb
diff --git a/EDMI.File/My Project/Resources.resx b/Modules.EDMI.File/My Project/Resources.resx
similarity index 100%
rename from EDMI.File/My Project/Resources.resx
rename to Modules.EDMI.File/My Project/Resources.resx
diff --git a/EDMI.File/My Project/Settings.Designer.vb b/Modules.EDMI.File/My Project/Settings.Designer.vb
similarity index 100%
rename from EDMI.File/My Project/Settings.Designer.vb
rename to Modules.EDMI.File/My Project/Settings.Designer.vb
diff --git a/EDMI.File/My Project/Settings.settings b/Modules.EDMI.File/My Project/Settings.settings
similarity index 100%
rename from EDMI.File/My Project/Settings.settings
rename to Modules.EDMI.File/My Project/Settings.settings
diff --git a/EDMI.File/Path.vb b/Modules.EDMI.File/Path.vb
similarity index 100%
rename from EDMI.File/Path.vb
rename to Modules.EDMI.File/Path.vb
diff --git a/EDMI.File/packages.config b/Modules.EDMI.File/packages.config
similarity index 100%
rename from EDMI.File/packages.config
rename to Modules.EDMI.File/packages.config