diff --git a/Content/.template.config/template.json b/Content/.template.config/template.json
index cd1b55e1..a5b1acb0 100644
--- a/Content/.template.config/template.json
+++ b/Content/.template.config/template.json
@@ -38,33 +38,32 @@
                         ".paket/**",
                         ".vscode/**",
                         ".editorconfig",
-                        "RELEASE_NOTES.md",
                         "**/paket.*",
                         "*.fsx",
-                        "src/SAFE.App.Client/package.default.json",
-                        "src/SAFE.App.Client/package-lock.default.json",
-                        "src/SAFE.App.Client/webpack.default.config.js",
+                        "src/Client/package.default.json",
+                        "src/Client/package-lock.default.json",
+                        "src/Client/webpack.default.config.js",
                         "README.md"
                     ],
                     "condition": "(minimal)"
                 },
                 {
                     "exclude": [
-                        "src/SAFE.App.Client/package.minimal.json",
-                        "src/SAFE.App.Client/package-lock.minimal.json",
-                        "src/SAFE.App.Client/webpack.minimal.config.js",
+                        "src/Client/package.minimal.json",
+                        "src/Client/package-lock.minimal.json",
+                        "src/Client/webpack.minimal.config.js",
                         "README-minimal.md"
                     ],
                     "condition": "(!minimal)"
                 },
                 {
                     "rename": {
-                        "src/SAFE.App.Client/webpack.default.config.js": "src/SAFE.App.Client/webpack.config.js",
-                        "src/SAFE.App.Client/webpack.minimal.config.js": "src/SAFE.App.Client/webpack.config.js",
-                        "src/SAFE.App.Client/package.minimal.json": "src/SAFE.App.Client/package.json",
-                        "src/SAFE.App.Client/package.default.json": "src/SAFE.App.Client/package.json",
-                        "src/SAFE.App.Client/package-lock.minimal.json": "src/SAFE.App.Client/package-lock.json",
-                        "src/SAFE.App.Client/package-lock.default.json": "src/SAFE.App.Client/package-lock.json",
+                        "src/Client/webpack.default.config.js": "src/Client/webpack.config.js",
+                        "src/Client/webpack.minimal.config.js": "src/Client/webpack.config.js",
+                        "src/Client/package.minimal.json": "src/Client/package.json",
+                        "src/Client/package.default.json": "src/Client/package.json",
+                        "src/Client/package-lock.minimal.json": "src/Client/package-lock.json",
+                        "src/Client/package-lock.default.json": "src/Client/package-lock.json",
                         "README-minimal.md": "README.md"
                     }
                 }
diff --git a/Content/README-minimal.md b/Content/README-minimal.md
index 91f3d27a..68e64883 100644
--- a/Content/README-minimal.md
+++ b/Content/README-minimal.md
@@ -11,13 +11,13 @@ You'll need to install the following pre-requisites in order to build SAFE appli
 ## Starting the application
 Start the server:
 ```bash
-cd src\SAFE.App.server\
+cd src\Server\
 dotnet run
 ```
 
 Start the client:
 ```bash
-cd src\SAFE.App.Client\
+cd src\Client\
 npm install
 npm run start
 ```
diff --git a/Content/SAFE.App.sln b/Content/SAFE.App.sln
index 8ec6dbc0..8823cc28 100644
--- a/Content/SAFE.App.sln
+++ b/Content/SAFE.App.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27004.2005
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SAFE.App.Client", "src\SAFE.App.Client\SAFE.App.Client.fsproj", "{73E8E820-C8AA-47CC-BB2B-152CA4D0B855}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SAFE.App.Shared", "src\Shared\SAFE.App.Shared.fsproj", "{28F090FB-E75F-4BE9-9E09-A70B1DA02C88}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SAFE.App.Server", "src\SAFE.App.Server\SAFE.App.Server.fsproj", "{73E8E820-C8AA-47CC-BB2B-152CA4D0B856}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SAFE.App.Server", "src\Server\SAFE.App.Server.fsproj", "{73E8E820-C8AA-47CC-BB2B-152CA4D0B856}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SAFE.App.Shared", "src\SAFE.App.Shared\SAFE.App.Shared.fsproj", "{28F090FB-E75F-4BE9-9E09-A70B1DA02C88}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SAFE.App.Client", "src\Client\SAFE.App.Client.fsproj", "{73E8E820-C8AA-47CC-BB2B-152CA4D0B855}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{08CCFCF6-2248-43ED-A6EF-E972A2DA0E6A}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/Content/build.fsx b/Content/build.fsx
index 08624254..358cc5db 100644
--- a/Content/build.fsx
+++ b/Content/build.fsx
@@ -10,8 +10,8 @@ open Farmer.Builders
 
 Target.initEnvironment ()
 
-let serverPath = Path.getFullName "./src/SAFE.App.Server"
-let clientPath = Path.getFullName "./src/SAFE.App.Client"
+let serverPath = Path.getFullName "./src/Server"
+let clientPath = Path.getFullName "./src/Client"
 let deployDir = Path.getFullName "./deploy"
 
 let npm args workingDir =
diff --git a/Content/src/SAFE.App.Client/Client.fs b/Content/src/Client/Client.fs
similarity index 100%
rename from Content/src/SAFE.App.Client/Client.fs
rename to Content/src/Client/Client.fs
diff --git a/Content/src/SAFE.App.Client/SAFE.App.Client.fsproj b/Content/src/Client/SAFE.App.Client.fsproj
similarity index 93%
rename from Content/src/SAFE.App.Client/SAFE.App.Client.fsproj
rename to Content/src/Client/SAFE.App.Client.fsproj
index eac22de7..caee687d 100644
--- a/Content/src/SAFE.App.Client/SAFE.App.Client.fsproj
+++ b/Content/src/Client/SAFE.App.Client.fsproj
@@ -16,7 +16,7 @@
     <Compile Include="Client.fs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SAFE.App.Shared\SAFE.App.Shared.fsproj" />
+    <ProjectReference Include="..\Shared\SAFE.App.Shared.fsproj" />
   </ItemGroup>
 <!--#if (minimal)
     <ItemGroup>
diff --git a/Content/src/SAFE.App.Client/index.html b/Content/src/Client/index.html
similarity index 100%
rename from Content/src/SAFE.App.Client/index.html
rename to Content/src/Client/index.html
diff --git a/Content/src/SAFE.App.Client/package-lock.default.json b/Content/src/Client/package-lock.default.json
similarity index 100%
rename from Content/src/SAFE.App.Client/package-lock.default.json
rename to Content/src/Client/package-lock.default.json
diff --git a/Content/src/SAFE.App.Client/package-lock.minimal.json b/Content/src/Client/package-lock.minimal.json
similarity index 100%
rename from Content/src/SAFE.App.Client/package-lock.minimal.json
rename to Content/src/Client/package-lock.minimal.json
diff --git a/Content/src/SAFE.App.Client/package.default.json b/Content/src/Client/package.default.json
similarity index 100%
rename from Content/src/SAFE.App.Client/package.default.json
rename to Content/src/Client/package.default.json
diff --git a/Content/src/SAFE.App.Client/package.minimal.json b/Content/src/Client/package.minimal.json
similarity index 100%
rename from Content/src/SAFE.App.Client/package.minimal.json
rename to Content/src/Client/package.minimal.json
diff --git a/Content/src/SAFE.App.Client/paket.references b/Content/src/Client/paket.references
similarity index 100%
rename from Content/src/SAFE.App.Client/paket.references
rename to Content/src/Client/paket.references
diff --git a/Content/src/SAFE.App.Client/public/favicon.png b/Content/src/Client/public/favicon.png
similarity index 100%
rename from Content/src/SAFE.App.Client/public/favicon.png
rename to Content/src/Client/public/favicon.png
diff --git a/Content/src/SAFE.App.Client/webpack.default.config.js b/Content/src/Client/webpack.default.config.js
similarity index 100%
rename from Content/src/SAFE.App.Client/webpack.default.config.js
rename to Content/src/Client/webpack.default.config.js
diff --git a/Content/src/SAFE.App.Client/webpack.minimal.config.js b/Content/src/Client/webpack.minimal.config.js
similarity index 100%
rename from Content/src/SAFE.App.Client/webpack.minimal.config.js
rename to Content/src/Client/webpack.minimal.config.js
diff --git a/Content/src/SAFE.App.Server/SAFE.App.Server.fsproj b/Content/src/Server/SAFE.App.Server.fsproj
similarity index 89%
rename from Content/src/SAFE.App.Server/SAFE.App.Server.fsproj
rename to Content/src/Server/SAFE.App.Server.fsproj
index 95834673..c19cd423 100644
--- a/Content/src/SAFE.App.Server/SAFE.App.Server.fsproj
+++ b/Content/src/Server/SAFE.App.Server.fsproj
@@ -12,7 +12,7 @@
     <Compile Include="Server.fs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SAFE.App.Shared\SAFE.App.Shared.fsproj" />
+    <ProjectReference Include="..\Shared\SAFE.App.Shared.fsproj" />
   </ItemGroup>
 <!--#if (minimal)
     <ItemGroup>
diff --git a/Content/src/SAFE.App.Server/Server.fs b/Content/src/Server/Server.fs
similarity index 100%
rename from Content/src/SAFE.App.Server/Server.fs
rename to Content/src/Server/Server.fs
diff --git a/Content/src/SAFE.App.Server/paket.references b/Content/src/Server/paket.references
similarity index 100%
rename from Content/src/SAFE.App.Server/paket.references
rename to Content/src/Server/paket.references
diff --git a/Content/src/SAFE.App.Shared/SAFE.App.Shared.fsproj b/Content/src/Shared/SAFE.App.Shared.fsproj
similarity index 100%
rename from Content/src/SAFE.App.Shared/SAFE.App.Shared.fsproj
rename to Content/src/Shared/SAFE.App.Shared.fsproj
diff --git a/Content/src/SAFE.App.Shared/Shared.fs b/Content/src/Shared/Shared.fs
similarity index 100%
rename from Content/src/SAFE.App.Shared/Shared.fs
rename to Content/src/Shared/Shared.fs
diff --git a/SAFE.Template.proj b/SAFE.Template.proj
index caf0ee76..352e2494 100644
--- a/SAFE.Template.proj
+++ b/SAFE.Template.proj
@@ -20,9 +20,9 @@ Content/src/**/obj/**/*;
 Content/src/**/bin/**/*;
 Content/packages/**/*;
 Content/paket-files/**/*;
-Content/src/SAFE.App.Client/.fable/**/*;
-Content/src/SAFE.App.Client/node_modules/**/*;
-Content/src/SAFE.App.Client/deploy/**/*;
+Content/src/Client/.fable/**/*;
+Content/src/Client/node_modules/**/*;
+Content/src/Client/deploy/**/*;
         </ExcludeFromPackage>
 </PropertyGroup>
     <ItemGroup>
diff --git a/build.fsx b/build.fsx
index 477d975b..e1de3367 100644
--- a/build.fsx
+++ b/build.fsx
@@ -32,7 +32,7 @@ Target.create "Clean" (fun _ ->
 
 Target.create "BuildWebPackConfig" (fun _ ->
     let srcDir = "paket-files/fable-compiler/webpack-config-template/webpack.config.js"
-    let destDir = "Content/src/SAFE.App.Client/webpack.config.js"
+    let destDir = "Content/src/Client/webpack.config.js"
     Shell.copyFile destDir srcDir
 
     let devServerProxy =