From 30b4eb07f729a0825c4e0ab09d934501dcdae340 Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <erisds@gmail.com>
Date: Thu, 11 Jul 2013 20:02:18 +0100
Subject: [PATCH] App restructure - closes #245

- This is a first pass at getting a more logical structure. The focus is on moving from admin/frontend to client/server.
- The location of the databases is highly important, this isn't expected to change again
In the future
- client/assets should probably become public/
- more stuff should be shared (helpers etc)
- cleanup some confusion around tpl and views
---
 .afignore                                     |   2 +-
 .gitignore                                    |  17 ++--
 Gruntfile.js                                  |  71 ++++++++++------
 config.js                                     |  10 +--
 core/README.md                                |  11 ++-
 core/admin/views/default.hbs                  |  76 ------------------
 .../assets/js => client}/admin-ui-temp.js     |   0
 .../assets/fonts/icons.dev.svg                |   0
 core/{admin => client}/assets/fonts/icons.eot | Bin
 core/{admin => client}/assets/fonts/icons.svg |   0
 core/{admin => client}/assets/fonts/icons.ttf | Bin
 .../{admin => client}/assets/fonts/icons.woff | Bin
 .../assets/img/dash/CampaignMonitor@2x.png    | Bin
 .../assets/img/dash/Facebook@2x.png           | Bin
 .../assets/img/dash/Facebook_Images@2x.png    | Bin
 .../assets/img/dash/GooglePlus@2x.png         | Bin
 .../assets/img/dash/Image@2x.png              | Bin
 .../assets/img/dash/PostsStats@2x.png         | Bin
 .../assets/img/dash/Stats@2x.png              | Bin
 .../assets/img/dash/Time@2x.png               | Bin
 .../assets/img/dash/Twitter@2x.png            | Bin
 .../assets/img/ghost-icon.png                 | Bin
 .../assets/img/loadingcat.gif                 | Bin
 core/{admin => client}/assets/img/logo.png    | Bin
 core/{admin => client}/assets/img/postimg.jpg | Bin
 .../assets/img/test-icon.png                  | Bin
 core/{admin => client}/assets/img/user.jpg    | Bin
 core/{admin => client}/assets/img/users.png   | Bin
 core/{admin => client}/assets/sass/ie.scss    |   0
 .../assets/sass/layouts/dashboard.scss        |   0
 .../assets/sass/layouts/editor.scss           |   0
 .../assets/sass/layouts/login.scss            |   0
 .../assets/sass/layouts/manage.scss           |   0
 .../assets/sass/layouts/settings.scss         |   0
 .../assets/sass/modules/animations.scss       |   0
 .../assets/sass/modules/breakpoint.scss       |   0
 .../assets/sass/modules/forms.scss            |   0
 .../assets/sass/modules/global.scss           |   0
 .../assets/sass/modules/icons.scss            |   0
 .../assets/sass/modules/mixins.scss           |   2 +-
 .../assets/sass/modules/normalize.scss        |   0
 .../assets/sass/modules/typeplate.scss        |   0
 .../{admin => client}/assets/sass/screen.scss |   0
 .../assets/vendor}/backbone/backbone.js       |   0
 .../lib => client/assets/vendor}/chart.min.js |   0
 .../assets/vendor}/codemirror/codemirror.css  |   0
 .../assets/vendor}/codemirror/codemirror.js   |   0
 .../codemirror/mode/markdown/index.html       |   0
 .../codemirror/mode/markdown/markdown.js      |   0
 .../vendor}/codemirror/mode/markdown/test.js  |   0
 .../lib => client/assets/vendor}/countable.js |   0
 .../vendor}/handlebars/handlebars-runtime.js  |   0
 .../vendor}/icheck/jquery.icheck.min.js       |   0
 .../jquery/jquery-ui-1.10.3.custom.min.js     |   0
 .../assets/vendor}/jquery/jquery.min.js       |   0
 .../lib => client/assets/vendor}/moment.js    |   0
 .../assets/vendor}/packery.pkgd.min.js        |   0
 .../lib => client/assets/vendor}/shortcuts.js |   0
 .../vendor}/showdown/extensions/ghostdown.js  |   0
 .../assets/vendor}/showdown/showdown.js       |   0
 .../assets/vendor}/underscore.js              |   0
 .../assets/js => client}/helpers/index.js     |   0
 core/{admin/assets/js => client}/init.js      |   0
 .../assets/js => client}/markdown-actions.js  |   0
 .../assets/js => client}/models/post.js       |   0
 .../assets/js => client}/models/settings.js   |   0
 .../assets/js => client}/models/widget.js     |   0
 core/{admin/assets/js => client}/router.js    |   0
 core/{admin/assets/js => client}/tagui.js     |   0
 core/{admin/assets/js => client}/toggle.js    |   0
 .../assets => client}/tpl/list-item.hbs       |   0
 core/{admin/assets => client}/tpl/preview.hbs |   0
 core/{admin/assets => client}/tpl/widget.hbs  |   0
 .../tpl/widgets/custom/instagram.hbs          |   0
 .../tpl/widgets/custom/lastfm.hbs             |   0
 .../tpl/widgets/custom/popular-posts.hbs      |   0
 .../tpl/widgets/custom/post-ideas.hbs         |   0
 .../tpl/widgets/custom/time.hbs               |   0
 .../tpl/widgets/custom/tweets.hbs             |   0
 .../tpl/widgets/custom/upcoming-posts.hbs     |   0
 .../tpl/widgets/default/blank.hbs             |   0
 .../tpl/widgets/default/number.hbs            |   0
 .../{admin/assets/js => client}/views/base.js |   0
 .../{admin/assets/js => client}/views/blog.js |   0
 .../assets/js => client}/views/dashboard.js   |   0
 .../assets/js => client}/views/debug.js       |   0
 .../assets/js => client}/views/editor.js      |   0
 .../assets/js => client}/views/settings.js    |   0
 core/ghost.js                                 |  22 ++---
 core/{shared => server}/api.js                |   0
 .../index.js => server/controllers/admin.js}  |   8 +-
 .../controllers/frontend.js}                  |   2 +-
 core/{shared => server}/data/export/001.js    |   0
 core/{shared => server}/data/export/index.js  |   0
 core/{shared => server}/data/fixtures/001.js  |   0
 core/{shared => server}/data/import/001.js    |   0
 core/{shared => server}/data/import/index.js  |   0
 core/{shared => server}/data/migration/001.js |   0
 core/{shared => server}/errorHandling.js      |   0
 core/{frontend => server}/filters/index.js    |   0
 core/{frontend => server}/helpers/index.js    |   2 +-
 .../views => server/helpers/tpl}/nav.hbs      |   0
 .../helpers/tpl}/pagination.hbs               |   0
 core/{shared => server}/models/base.js        |   0
 core/{shared => server}/models/index.js       |   0
 core/{shared => server}/models/permission.js  |   0
 core/{shared => server}/models/post.js        |   0
 core/{shared => server}/models/role.js        |   0
 core/{shared => server}/models/settings.js    |   0
 core/{shared => server}/models/user.js        |   0
 core/{shared => server}/permissions/index.js  |   0
 .../permissions/objectTypeModelMap.js         |   0
 core/{shared => server}/require-tree.js       |   0
 core/{admin => server}/views/content.hbs      |   0
 core/{admin => server}/views/dashboard.hbs    |   2 +-
 core/{admin => server}/views/debug.hbs        |   0
 core/server/views/default.hbs                 |  76 ++++++++++++++++++
 core/{admin => server}/views/editor.hbs       |   0
 core/{admin => server}/views/login.hbs        |   0
 .../views/partials/flashes.hbs                |   0
 .../views/partials/navbar.hbs                 |   2 +-
 core/{admin => server}/views/settings.hbs     |   8 +-
 core/{admin => server}/views/signup.hbs       |   0
 core/{ => shared}/lang/en.json                |   0
 core/{ => shared}/lang/en_PL.json             |   0
 core/{ => shared}/lang/i18n.js                |   0
 core/test/ghost/api_permissions_spec.js       |   4 +-
 core/test/ghost/api_posts_spec.js             |   2 +-
 core/test/ghost/api_settings_spec.js          |   2 +-
 core/test/ghost/api_users_spec.js             |   4 +-
 core/test/ghost/errorHandling_spec.js         |   2 +-
 core/test/ghost/export_spec.js                |   6 +-
 .../test/ghost/frontend_helpers_index_spec.js |   2 +-
 core/test/ghost/ghost_spec.js                 |   2 +-
 core/test/ghost/helpers.js                    |   4 +-
 core/test/ghost/import_spec.js                |  10 +--
 core/test/ghost/permissions_spec.js           |   6 +-
 index.js                                      |  14 ++--
 138 files changed, 194 insertions(+), 175 deletions(-)
 delete mode 100644 core/admin/views/default.hbs
 rename core/{admin/assets/js => client}/admin-ui-temp.js (100%)
 rename core/{admin => client}/assets/fonts/icons.dev.svg (100%)
 rename core/{admin => client}/assets/fonts/icons.eot (100%)
 rename core/{admin => client}/assets/fonts/icons.svg (100%)
 rename core/{admin => client}/assets/fonts/icons.ttf (100%)
 rename core/{admin => client}/assets/fonts/icons.woff (100%)
 rename core/{admin => client}/assets/img/dash/CampaignMonitor@2x.png (100%)
 rename core/{admin => client}/assets/img/dash/Facebook@2x.png (100%)
 rename core/{admin => client}/assets/img/dash/Facebook_Images@2x.png (100%)
 rename core/{admin => client}/assets/img/dash/GooglePlus@2x.png (100%)
 rename core/{admin => client}/assets/img/dash/Image@2x.png (100%)
 rename core/{admin => client}/assets/img/dash/PostsStats@2x.png (100%)
 rename core/{admin => client}/assets/img/dash/Stats@2x.png (100%)
 rename core/{admin => client}/assets/img/dash/Time@2x.png (100%)
 rename core/{admin => client}/assets/img/dash/Twitter@2x.png (100%)
 rename core/{admin => client}/assets/img/ghost-icon.png (100%)
 rename core/{admin => client}/assets/img/loadingcat.gif (100%)
 rename core/{admin => client}/assets/img/logo.png (100%)
 rename core/{admin => client}/assets/img/postimg.jpg (100%)
 rename core/{admin => client}/assets/img/test-icon.png (100%)
 rename core/{admin => client}/assets/img/user.jpg (100%)
 rename core/{admin => client}/assets/img/users.png (100%)
 rename core/{admin => client}/assets/sass/ie.scss (100%)
 rename core/{admin => client}/assets/sass/layouts/dashboard.scss (100%)
 rename core/{admin => client}/assets/sass/layouts/editor.scss (100%)
 rename core/{admin => client}/assets/sass/layouts/login.scss (100%)
 rename core/{admin => client}/assets/sass/layouts/manage.scss (100%)
 rename core/{admin => client}/assets/sass/layouts/settings.scss (100%)
 rename core/{admin => client}/assets/sass/modules/animations.scss (100%)
 rename core/{admin => client}/assets/sass/modules/breakpoint.scss (100%)
 rename core/{admin => client}/assets/sass/modules/forms.scss (100%)
 rename core/{admin => client}/assets/sass/modules/global.scss (100%)
 rename core/{admin => client}/assets/sass/modules/icons.scss (100%)
 rename core/{admin => client}/assets/sass/modules/mixins.scss (99%)
 rename core/{admin => client}/assets/sass/modules/normalize.scss (100%)
 rename core/{admin => client}/assets/sass/modules/typeplate.scss (100%)
 rename core/{admin => client}/assets/sass/screen.scss (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/backbone/backbone.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/chart.min.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/codemirror/codemirror.css (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/codemirror/codemirror.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/codemirror/mode/markdown/index.html (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/codemirror/mode/markdown/markdown.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/codemirror/mode/markdown/test.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/countable.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/handlebars/handlebars-runtime.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/icheck/jquery.icheck.min.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/jquery/jquery-ui-1.10.3.custom.min.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/jquery/jquery.min.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/moment.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/packery.pkgd.min.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/shortcuts.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/showdown/extensions/ghostdown.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/showdown/showdown.js (100%)
 rename core/{admin/assets/lib => client/assets/vendor}/underscore.js (100%)
 rename core/{admin/assets/js => client}/helpers/index.js (100%)
 rename core/{admin/assets/js => client}/init.js (100%)
 rename core/{admin/assets/js => client}/markdown-actions.js (100%)
 rename core/{admin/assets/js => client}/models/post.js (100%)
 rename core/{admin/assets/js => client}/models/settings.js (100%)
 rename core/{admin/assets/js => client}/models/widget.js (100%)
 rename core/{admin/assets/js => client}/router.js (100%)
 rename core/{admin/assets/js => client}/tagui.js (100%)
 rename core/{admin/assets/js => client}/toggle.js (100%)
 rename core/{admin/assets => client}/tpl/list-item.hbs (100%)
 rename core/{admin/assets => client}/tpl/preview.hbs (100%)
 rename core/{admin/assets => client}/tpl/widget.hbs (100%)
 rename core/{admin/assets => client}/tpl/widgets/custom/instagram.hbs (100%)
 rename core/{admin/assets => client}/tpl/widgets/custom/lastfm.hbs (100%)
 rename core/{admin/assets => client}/tpl/widgets/custom/popular-posts.hbs (100%)
 rename core/{admin/assets => client}/tpl/widgets/custom/post-ideas.hbs (100%)
 rename core/{admin/assets => client}/tpl/widgets/custom/time.hbs (100%)
 rename core/{admin/assets => client}/tpl/widgets/custom/tweets.hbs (100%)
 rename core/{admin/assets => client}/tpl/widgets/custom/upcoming-posts.hbs (100%)
 rename core/{admin/assets => client}/tpl/widgets/default/blank.hbs (100%)
 rename core/{admin/assets => client}/tpl/widgets/default/number.hbs (100%)
 rename core/{admin/assets/js => client}/views/base.js (100%)
 rename core/{admin/assets/js => client}/views/blog.js (100%)
 rename core/{admin/assets/js => client}/views/dashboard.js (100%)
 rename core/{admin/assets/js => client}/views/debug.js (100%)
 rename core/{admin/assets/js => client}/views/editor.js (100%)
 rename core/{admin/assets/js => client}/views/settings.js (100%)
 rename core/{shared => server}/api.js (100%)
 rename core/{admin/controllers/index.js => server/controllers/admin.js} (97%)
 mode change 100755 => 100644
 rename core/{frontend/controllers/index.js => server/controllers/frontend.js} (96%)
 rename core/{shared => server}/data/export/001.js (100%)
 rename core/{shared => server}/data/export/index.js (100%)
 rename core/{shared => server}/data/fixtures/001.js (100%)
 rename core/{shared => server}/data/import/001.js (100%)
 rename core/{shared => server}/data/import/index.js (100%)
 rename core/{shared => server}/data/migration/001.js (100%)
 rename core/{shared => server}/errorHandling.js (100%)
 rename core/{frontend => server}/filters/index.js (100%)
 rename core/{frontend => server}/helpers/index.js (99%)
 rename core/{frontend/views => server/helpers/tpl}/nav.hbs (100%)
 rename core/{frontend/views => server/helpers/tpl}/pagination.hbs (100%)
 rename core/{shared => server}/models/base.js (100%)
 rename core/{shared => server}/models/index.js (100%)
 rename core/{shared => server}/models/permission.js (100%)
 rename core/{shared => server}/models/post.js (100%)
 rename core/{shared => server}/models/role.js (100%)
 rename core/{shared => server}/models/settings.js (100%)
 rename core/{shared => server}/models/user.js (100%)
 rename core/{shared => server}/permissions/index.js (100%)
 rename core/{shared => server}/permissions/objectTypeModelMap.js (100%)
 rename core/{shared => server}/require-tree.js (100%)
 rename core/{admin => server}/views/content.hbs (100%)
 rename core/{admin => server}/views/dashboard.hbs (92%)
 rename core/{admin => server}/views/debug.hbs (100%)
 create mode 100644 core/server/views/default.hbs
 rename core/{admin => server}/views/editor.hbs (100%)
 rename core/{admin => server}/views/login.hbs (100%)
 rename core/{admin => server}/views/partials/flashes.hbs (100%)
 rename core/{admin => server}/views/partials/navbar.hbs (92%)
 rename core/{admin => server}/views/settings.hbs (95%)
 rename core/{admin => server}/views/signup.hbs (100%)
 mode change 100755 => 100644
 rename core/{ => shared}/lang/en.json (100%)
 rename core/{ => shared}/lang/en_PL.json (100%)
 rename core/{ => shared}/lang/i18n.js (100%)

diff --git a/.afignore b/.afignore
index 08665d9e86..a8b40cae30 100644
--- a/.afignore
+++ b/.afignore
@@ -21,4 +21,4 @@ projectFilesBackup
 .DS_Store
 
 # Ghost DB file
-ghost/data/*.db
\ No newline at end of file
+*.db
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 577c104269..73cc7efb9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,15 +26,14 @@ projectFilesBackup
 .build
 .dist
 
-/core/admin/assets/tpl/hbs-tpl.js
-/core/admin/assets/css
-/core/admin/assets/sass/modules/bourbon
+/core/client/tpl/hbs-tpl.js
+/core/client/assets/css
 .sass-cache/
-/core/admin/assets/sass/config.rb
-/core/admin/assets/sass/layouts/config.rb
-/core/admin/assets/sass/modules/config.rb
-/core/admin/assets/sass/modules/bourbon
-/ghost/.idea/
-/core/shared/data/export/exported*
+/core/client/assets/sass/config.rb
+/core/client/assets/sass/layouts/config.rb
+/core/client/assets/sass/modules/config.rb
+/core/client/assets/sass/modules/bourbon
+/core/client/assets/sass/modules/bourbon/*
+/core/server/data/export/exported*
 /docs
 /_site
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index 25952025b3..b89823943a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,7 +6,7 @@ var path = require('path'),
         var cfg = {
             // Common paths to be used by tasks
             paths: {
-                adminAssets: './core/admin/assets',
+                adminAssets: './core/client/assets',
                 build: buildDirectory,
                 nightlyBuild: path.join(buildDirectory, 'nightly'),
                 weeklyBuild: path.join(buildDirectory, 'weekly'),
@@ -21,7 +21,7 @@ var path = require('path'),
 
             // JSLint all the things!
             jslintm: {
-                node: {
+                server: {
                     directives: {
                         // node environment
                         node: true,
@@ -39,17 +39,12 @@ var path = require('path'),
                     files: {
                         src: [
                             "*.js",
-                            "core/**/*.js"
+                            "core/*.js",
+                            "core/server/**/*.js"
                         ]
-                    },
-                    // Lint core files, but not libs, frontend or hbs files
-                    exclude: [
-                        "**/assets/lib/**/*.js",
-                        "**/assets/js/**/*.js",
-                        "**/assets/tpl/*.js"
-                    ]
+                    }
                 },
-                frontend: {
+                client: {
                     directives: {
                         // node environment
                         node: false,
@@ -63,7 +58,32 @@ var path = require('path'),
                         unparam: true
                     },
                     files: {
-                        src: "**/assets/js/**/*.js"
+                        src: "core/client/**/*.js"
+                    },
+                    exclude: [
+                        "core/client/assets/**/*.js",
+                        "core/client/tpl/**/*.js"
+                    ]
+                },
+                shared: {
+                    directives: {
+                        // node environment
+                        node: true,
+                        // browser environment
+                        browser: false,
+                        // allow dangling underscores in var names
+                        nomen: true,
+                        // allow to do statements
+                        todo: true,
+                        // allow unused parameters
+                        unparam: true,
+                        // don't require use strict pragma
+                        sloppy: true
+                    },
+                    files: {
+                        src: [
+                            "core/shared/**/*.js"
+                        ]
                     }
                 }
             },
@@ -107,12 +127,12 @@ var path = require('path'),
                     options: {
                         namespace: "JST",
                         processName: function (filename) {
-                            filename = filename.replace('./core/admin/assets/tpl/', '');
+                            filename = filename.replace('./core/client/tpl/', '');
                             return filename.replace('.hbs', '');
                         }
                     },
                     files: {
-                        "<%= paths.adminAssets %>/tpl/hbs-tpl.js": "<%= paths.adminAssets %>/tpl/**/*.hbs"
+                        "core/client/tpl/hbs-tpl.js": "core/client/tpl/**/*.hbs"
                     }
                 }
             },
@@ -126,15 +146,13 @@ var path = require('path'),
                             "config.js",
                             "index.js",
                             "core/ghost.js",
-                            "core/admin/assets/js/*.js",
-                            "core/admin/assets/js/**/*.js",
-                            "core/admin/controllers/*.js",
-                            "core/frontend/**/*.js",
-                            "core/lang/i18n.js",
+                            "core/server/**/*.js",
                             "core/shared/**/*.js",
-                            "core/shared/*.js",
-                            "core/test/**/*.js",
-                            "core/test/ghost.js"
+                            "core/client/**/*.js"
+                        ],
+                        "except": [
+                            "!core/client/assets/**/*.js",
+                            "!core/client/tpl/**/*.js"
                         ]
                     }
                 }
@@ -142,7 +160,7 @@ var path = require('path'),
 
             watch: {
                 handlebars: {
-                    files: '<%= paths.adminAssets %>/tpl/**/*.hbs',
+                    files: 'core/client/tpl/**/*.hbs',
                     tasks: ['handlebars']
                 },
                 sass: {
@@ -158,7 +176,7 @@ var path = require('path'),
                         src: [
                             '**',
                             '!node_modules/**',
-                            '!core/shared/data/*.db',
+                            '!core/server/data/*.db',
                             '!.sass*',
                             '!.af*',
                             '!.git*',
@@ -174,7 +192,7 @@ var path = require('path'),
                         src: [
                             '**',
                             '!node_modules/**',
-                            '!core/shared/data/*.db',
+                            '!core/server/data/*.db',
                             '!.sass*',
                             '!.af*',
                             '!.git*',
@@ -190,11 +208,12 @@ var path = require('path'),
                         src: [
                             '**',
                             '!node_modules/**',
-                            '!core/shared/data/*.db',
+                            '!core/server/data/*.db',
                             '!.sass*',
                             '!.af*',
                             '!.git*',
                             '!.groc*',
+                            '!.iml*',
                             '!.travis.yml'
                         ],
                         dest: "<%= paths.buildBuild %>/"
diff --git a/config.js b/config.js
index 4d78613143..14245e42de 100644
--- a/config.js
+++ b/config.js
@@ -58,7 +58,7 @@ config.env = {
         database: {
             client: 'sqlite3',
             connection: {
-                filename: path.join(__dirname, '/core/shared/data/ghost-test.db')
+                filename: path.join(__dirname, '/core/server/data/ghost-test.db')
             }
         },
         url: {
@@ -71,7 +71,7 @@ config.env = {
         database: {
             client: 'sqlite3',
             connection: {
-                filename: path.join(__dirname, '/core/shared/data/ghost-travis.db')
+                filename: path.join(__dirname, '/core/server/data/ghost-travis.db')
             }
         },
         url: {
@@ -84,7 +84,7 @@ config.env = {
         database: {
             client: 'sqlite3',
             connection: {
-                filename: path.join(__dirname, '/core/shared/data/ghost-dev.db')
+                filename: path.join(__dirname, '/core/server/data/ghost-dev.db')
             },
             debug: false
         },
@@ -98,7 +98,7 @@ config.env = {
         database: {
             client: 'sqlite3',
             connection: {
-                filename: path.join(__dirname, '/core/shared/data/ghost-staging.db')
+                filename: path.join(__dirname, '/core/server/data/ghost-staging.db')
             },
             debug: false
         },
@@ -112,7 +112,7 @@ config.env = {
         database: {
             client: 'sqlite3',
             connection: {
-                filename: path.join(__dirname, '/core/shared/data/ghost.db')
+                filename: path.join(__dirname, '/core/server/data/ghost.db')
             },
             debug: false
         },
diff --git a/core/README.md b/core/README.md
index 9268207010..2d4e788d8c 100644
--- a/core/README.md
+++ b/core/README.md
@@ -2,11 +2,10 @@
 
 Core contains the bread and butter of ghost. It is currently divided up into:
 
-* **admin** - the views, controllers, assets and helpers for rendering & working the admin panel
-* **frontend** - the controllers & helpers for creating the frontend of the blog. Views & assets live in themes
-* **lang** - the current home of everything i18n, this was done as a proof of concept on a very early version of the prototype and needs love
-* **shared** - basically everything to do with data & models. The sqlite db file lives in the data folder here. This is the part that needs the most work so it doesn't make much sense yet, and is also the highest priority
-* **test** - currently contains two sad unit tests and a set of html prototypes of the admin UI. Really, this folder should reflect all of core. It is my personal mission to make that happen ASAP & get us linked up with Travis.
-* **ghost.js** - currently both the glue that binds everything together and what gives us the API for registering themes and plugins. The initTheme function is a bit of a hack which lets us serve different views & static content up for the admin & frontend.
+* **client** - the assets, helpers, models, view and templates for rendering the admin panel backbone app
+* **server** - the controllers & helpers for driving the server side app along with the model, api, and data
+* **shared** - just contains lang for now, although it's not shared yet, more stuff should go here soon like handlebars helpers
+* **test** - contains unit tests and a set of html prototypes of the admin UI. Really, this folder should reflect all of core
+* **ghost.js** - currently both the glue that binds everything together and what gives us the API for registering themes and plugins. The initTheme function is a bit of a hack which lets us serve different views & static content up for the admin & blog
 
 This structure is by no means final and recommendations are more than welcome.
\ No newline at end of file
diff --git a/core/admin/views/default.hbs b/core/admin/views/default.hbs
deleted file mode 100644
index 6d8a1a3737..0000000000
--- a/core/admin/views/default.hbs
+++ /dev/null
@@ -1,76 +0,0 @@
-<!doctype html>
-<!--[if lt IE 7]><html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
-<!--[if (IE 7)&!(IEMobile)]><html class="no-js lt-ie9 lt-ie8" lang="en"><![endif]-->
-<!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
-<!--[if (gte IE 9)| IEMobile |!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]-->
-    <head>
-        <meta charset="utf-8">
-
-        <title>{{siteTitle}}</title>
-        <meta name="description" content="{{siteDescription}}">
-        <meta name="author" content="">
-        <meta name="HandheldFriendly" content="True">
-        <meta name="MobileOptimized" content="320">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta name="apple-mobile-web-app-capable" content="yes" />
-
-        <link rel="shortcut icon" href="/favicon.ico">
-        <meta http-equiv="cleartype" content="on">
-
-        <link rel="stylesheet" type='text/css' href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,700'>
-        <link rel="stylesheet" href="/core/admin/assets/css/screen.css">
-        <link rel="stylesheet" type="text/css" href="/core/admin/assets/lib/codemirror/codemirror.css"> <!-- TODO: Kill this - #29 -->
-        {{{block "pageStyles"}}}
-    </head>
-    <body class="{{bodyClass}}">
-        {{#unless hideNavbar}}
-            {{> navbar}}
-        {{/unless}}
-
-        <main role="main" id="main">
-            {{> flashes}}
-
-            {{{body}}}
-        </main>
-
-        <script src="/core/admin/assets/lib/jquery/jquery.min.js"></script>
-        <script src="/core/admin/assets/lib/icheck/jquery.icheck.min.js"></script>
-        <script src="/core/admin/assets/lib/underscore.js"></script>
-        <script src="/core/admin/assets/lib/backbone/backbone.js"></script>
-        <script src="/core/admin/assets/lib/handlebars/handlebars-runtime.js"></script>
-        <script src="/core/admin/assets/lib/codemirror/codemirror.js"></script>
-        <script src="/core/admin/assets/lib/codemirror/mode/markdown/markdown.js"></script>
-        <script src="/core/admin/assets/lib/showdown/showdown.js"></script>
-        <script src="/core/admin/assets/lib/showdown/extensions/ghostdown.js"></script>
-        <script src="/core/admin/assets/lib/shortcuts.js"></script>
-        <script src="/core/admin/assets/lib/countable.js"></script>
-        <script src="/core/admin/assets/lib/jquery/jquery-ui-1.10.3.custom.min.js"></script>
-        <script src="/core/admin/assets/lib/packery.pkgd.min.js"></script>
-
-        <script src="/core/admin/assets/js/init.js"></script>
-        <script src="/core/admin/assets/tpl/hbs-tpl.js"></script>
-        <script src="/core/admin/assets/js/toggle.js"></script>
-        <script src="/core/admin/assets/js/admin-ui-temp.js"></script>
-        <script src="/core/admin/assets/js/markdown-actions.js"></script>
-        <script src="/core/admin/assets/js/tagui.js"></script>
-        <script src="/core/admin/assets/lib/moment.js"></script>
-        <script src="/core/admin/assets/js/helpers/index.js"></script>
-
-        <!-- // require '/core/admin/assets/js/models/*' -->
-        <script src="/core/admin/assets/js/models/post.js"></script>
-        <script src="/core/admin/assets/js/models/widget.js"></script>
-        <script src="/core/admin/assets/js/models/settings.js"></script>
-        <!-- // require '/core/admin/assets/js/views/*' -->
-        <script src="/core/admin/assets/js/views/base.js"></script>
-        <script src="/core/admin/assets/js/views/dashboard.js"></script>
-        <script src="/core/admin/assets/js/views/blog.js"></script>
-        <script src="/core/admin/assets/js/views/editor.js"></script>
-        <script src="/core/admin/assets/js/views/settings.js"></script>
-        <script src="/core/admin/assets/js/views/debug.js"></script>
-        <script src="/core/admin/assets/js/router.js"></script>
-        {{{block "bodyScripts"}}}
-        <script>
-            Ghost.init();
-        </script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/core/admin/assets/js/admin-ui-temp.js b/core/client/admin-ui-temp.js
similarity index 100%
rename from core/admin/assets/js/admin-ui-temp.js
rename to core/client/admin-ui-temp.js
diff --git a/core/admin/assets/fonts/icons.dev.svg b/core/client/assets/fonts/icons.dev.svg
similarity index 100%
rename from core/admin/assets/fonts/icons.dev.svg
rename to core/client/assets/fonts/icons.dev.svg
diff --git a/core/admin/assets/fonts/icons.eot b/core/client/assets/fonts/icons.eot
similarity index 100%
rename from core/admin/assets/fonts/icons.eot
rename to core/client/assets/fonts/icons.eot
diff --git a/core/admin/assets/fonts/icons.svg b/core/client/assets/fonts/icons.svg
similarity index 100%
rename from core/admin/assets/fonts/icons.svg
rename to core/client/assets/fonts/icons.svg
diff --git a/core/admin/assets/fonts/icons.ttf b/core/client/assets/fonts/icons.ttf
similarity index 100%
rename from core/admin/assets/fonts/icons.ttf
rename to core/client/assets/fonts/icons.ttf
diff --git a/core/admin/assets/fonts/icons.woff b/core/client/assets/fonts/icons.woff
similarity index 100%
rename from core/admin/assets/fonts/icons.woff
rename to core/client/assets/fonts/icons.woff
diff --git a/core/admin/assets/img/dash/CampaignMonitor@2x.png b/core/client/assets/img/dash/CampaignMonitor@2x.png
similarity index 100%
rename from core/admin/assets/img/dash/CampaignMonitor@2x.png
rename to core/client/assets/img/dash/CampaignMonitor@2x.png
diff --git a/core/admin/assets/img/dash/Facebook@2x.png b/core/client/assets/img/dash/Facebook@2x.png
similarity index 100%
rename from core/admin/assets/img/dash/Facebook@2x.png
rename to core/client/assets/img/dash/Facebook@2x.png
diff --git a/core/admin/assets/img/dash/Facebook_Images@2x.png b/core/client/assets/img/dash/Facebook_Images@2x.png
similarity index 100%
rename from core/admin/assets/img/dash/Facebook_Images@2x.png
rename to core/client/assets/img/dash/Facebook_Images@2x.png
diff --git a/core/admin/assets/img/dash/GooglePlus@2x.png b/core/client/assets/img/dash/GooglePlus@2x.png
similarity index 100%
rename from core/admin/assets/img/dash/GooglePlus@2x.png
rename to core/client/assets/img/dash/GooglePlus@2x.png
diff --git a/core/admin/assets/img/dash/Image@2x.png b/core/client/assets/img/dash/Image@2x.png
similarity index 100%
rename from core/admin/assets/img/dash/Image@2x.png
rename to core/client/assets/img/dash/Image@2x.png
diff --git a/core/admin/assets/img/dash/PostsStats@2x.png b/core/client/assets/img/dash/PostsStats@2x.png
similarity index 100%
rename from core/admin/assets/img/dash/PostsStats@2x.png
rename to core/client/assets/img/dash/PostsStats@2x.png
diff --git a/core/admin/assets/img/dash/Stats@2x.png b/core/client/assets/img/dash/Stats@2x.png
similarity index 100%
rename from core/admin/assets/img/dash/Stats@2x.png
rename to core/client/assets/img/dash/Stats@2x.png
diff --git a/core/admin/assets/img/dash/Time@2x.png b/core/client/assets/img/dash/Time@2x.png
similarity index 100%
rename from core/admin/assets/img/dash/Time@2x.png
rename to core/client/assets/img/dash/Time@2x.png
diff --git a/core/admin/assets/img/dash/Twitter@2x.png b/core/client/assets/img/dash/Twitter@2x.png
similarity index 100%
rename from core/admin/assets/img/dash/Twitter@2x.png
rename to core/client/assets/img/dash/Twitter@2x.png
diff --git a/core/admin/assets/img/ghost-icon.png b/core/client/assets/img/ghost-icon.png
similarity index 100%
rename from core/admin/assets/img/ghost-icon.png
rename to core/client/assets/img/ghost-icon.png
diff --git a/core/admin/assets/img/loadingcat.gif b/core/client/assets/img/loadingcat.gif
similarity index 100%
rename from core/admin/assets/img/loadingcat.gif
rename to core/client/assets/img/loadingcat.gif
diff --git a/core/admin/assets/img/logo.png b/core/client/assets/img/logo.png
similarity index 100%
rename from core/admin/assets/img/logo.png
rename to core/client/assets/img/logo.png
diff --git a/core/admin/assets/img/postimg.jpg b/core/client/assets/img/postimg.jpg
similarity index 100%
rename from core/admin/assets/img/postimg.jpg
rename to core/client/assets/img/postimg.jpg
diff --git a/core/admin/assets/img/test-icon.png b/core/client/assets/img/test-icon.png
similarity index 100%
rename from core/admin/assets/img/test-icon.png
rename to core/client/assets/img/test-icon.png
diff --git a/core/admin/assets/img/user.jpg b/core/client/assets/img/user.jpg
similarity index 100%
rename from core/admin/assets/img/user.jpg
rename to core/client/assets/img/user.jpg
diff --git a/core/admin/assets/img/users.png b/core/client/assets/img/users.png
similarity index 100%
rename from core/admin/assets/img/users.png
rename to core/client/assets/img/users.png
diff --git a/core/admin/assets/sass/ie.scss b/core/client/assets/sass/ie.scss
similarity index 100%
rename from core/admin/assets/sass/ie.scss
rename to core/client/assets/sass/ie.scss
diff --git a/core/admin/assets/sass/layouts/dashboard.scss b/core/client/assets/sass/layouts/dashboard.scss
similarity index 100%
rename from core/admin/assets/sass/layouts/dashboard.scss
rename to core/client/assets/sass/layouts/dashboard.scss
diff --git a/core/admin/assets/sass/layouts/editor.scss b/core/client/assets/sass/layouts/editor.scss
similarity index 100%
rename from core/admin/assets/sass/layouts/editor.scss
rename to core/client/assets/sass/layouts/editor.scss
diff --git a/core/admin/assets/sass/layouts/login.scss b/core/client/assets/sass/layouts/login.scss
similarity index 100%
rename from core/admin/assets/sass/layouts/login.scss
rename to core/client/assets/sass/layouts/login.scss
diff --git a/core/admin/assets/sass/layouts/manage.scss b/core/client/assets/sass/layouts/manage.scss
similarity index 100%
rename from core/admin/assets/sass/layouts/manage.scss
rename to core/client/assets/sass/layouts/manage.scss
diff --git a/core/admin/assets/sass/layouts/settings.scss b/core/client/assets/sass/layouts/settings.scss
similarity index 100%
rename from core/admin/assets/sass/layouts/settings.scss
rename to core/client/assets/sass/layouts/settings.scss
diff --git a/core/admin/assets/sass/modules/animations.scss b/core/client/assets/sass/modules/animations.scss
similarity index 100%
rename from core/admin/assets/sass/modules/animations.scss
rename to core/client/assets/sass/modules/animations.scss
diff --git a/core/admin/assets/sass/modules/breakpoint.scss b/core/client/assets/sass/modules/breakpoint.scss
similarity index 100%
rename from core/admin/assets/sass/modules/breakpoint.scss
rename to core/client/assets/sass/modules/breakpoint.scss
diff --git a/core/admin/assets/sass/modules/forms.scss b/core/client/assets/sass/modules/forms.scss
similarity index 100%
rename from core/admin/assets/sass/modules/forms.scss
rename to core/client/assets/sass/modules/forms.scss
diff --git a/core/admin/assets/sass/modules/global.scss b/core/client/assets/sass/modules/global.scss
similarity index 100%
rename from core/admin/assets/sass/modules/global.scss
rename to core/client/assets/sass/modules/global.scss
diff --git a/core/admin/assets/sass/modules/icons.scss b/core/client/assets/sass/modules/icons.scss
similarity index 100%
rename from core/admin/assets/sass/modules/icons.scss
rename to core/client/assets/sass/modules/icons.scss
diff --git a/core/admin/assets/sass/modules/mixins.scss b/core/client/assets/sass/modules/mixins.scss
similarity index 99%
rename from core/admin/assets/sass/modules/mixins.scss
rename to core/client/assets/sass/modules/mixins.scss
index ff0a22d6d5..fa270eaac9 100644
--- a/core/admin/assets/sass/modules/mixins.scss
+++ b/core/client/assets/sass/modules/mixins.scss
@@ -19,7 +19,7 @@
    ============================================================================= */
 
 // Bourbon - http://bourbon.io/
-@import "bourbon/bourbon";
+@import "bourbon/_bourbon";
 $rounded: 2px;
 $shadow: rgba(0,0,0,0.05) 0 1px 5px;
 $default-transition-duration: 0.3s;
diff --git a/core/admin/assets/sass/modules/normalize.scss b/core/client/assets/sass/modules/normalize.scss
similarity index 100%
rename from core/admin/assets/sass/modules/normalize.scss
rename to core/client/assets/sass/modules/normalize.scss
diff --git a/core/admin/assets/sass/modules/typeplate.scss b/core/client/assets/sass/modules/typeplate.scss
similarity index 100%
rename from core/admin/assets/sass/modules/typeplate.scss
rename to core/client/assets/sass/modules/typeplate.scss
diff --git a/core/admin/assets/sass/screen.scss b/core/client/assets/sass/screen.scss
similarity index 100%
rename from core/admin/assets/sass/screen.scss
rename to core/client/assets/sass/screen.scss
diff --git a/core/admin/assets/lib/backbone/backbone.js b/core/client/assets/vendor/backbone/backbone.js
similarity index 100%
rename from core/admin/assets/lib/backbone/backbone.js
rename to core/client/assets/vendor/backbone/backbone.js
diff --git a/core/admin/assets/lib/chart.min.js b/core/client/assets/vendor/chart.min.js
similarity index 100%
rename from core/admin/assets/lib/chart.min.js
rename to core/client/assets/vendor/chart.min.js
diff --git a/core/admin/assets/lib/codemirror/codemirror.css b/core/client/assets/vendor/codemirror/codemirror.css
similarity index 100%
rename from core/admin/assets/lib/codemirror/codemirror.css
rename to core/client/assets/vendor/codemirror/codemirror.css
diff --git a/core/admin/assets/lib/codemirror/codemirror.js b/core/client/assets/vendor/codemirror/codemirror.js
similarity index 100%
rename from core/admin/assets/lib/codemirror/codemirror.js
rename to core/client/assets/vendor/codemirror/codemirror.js
diff --git a/core/admin/assets/lib/codemirror/mode/markdown/index.html b/core/client/assets/vendor/codemirror/mode/markdown/index.html
similarity index 100%
rename from core/admin/assets/lib/codemirror/mode/markdown/index.html
rename to core/client/assets/vendor/codemirror/mode/markdown/index.html
diff --git a/core/admin/assets/lib/codemirror/mode/markdown/markdown.js b/core/client/assets/vendor/codemirror/mode/markdown/markdown.js
similarity index 100%
rename from core/admin/assets/lib/codemirror/mode/markdown/markdown.js
rename to core/client/assets/vendor/codemirror/mode/markdown/markdown.js
diff --git a/core/admin/assets/lib/codemirror/mode/markdown/test.js b/core/client/assets/vendor/codemirror/mode/markdown/test.js
similarity index 100%
rename from core/admin/assets/lib/codemirror/mode/markdown/test.js
rename to core/client/assets/vendor/codemirror/mode/markdown/test.js
diff --git a/core/admin/assets/lib/countable.js b/core/client/assets/vendor/countable.js
similarity index 100%
rename from core/admin/assets/lib/countable.js
rename to core/client/assets/vendor/countable.js
diff --git a/core/admin/assets/lib/handlebars/handlebars-runtime.js b/core/client/assets/vendor/handlebars/handlebars-runtime.js
similarity index 100%
rename from core/admin/assets/lib/handlebars/handlebars-runtime.js
rename to core/client/assets/vendor/handlebars/handlebars-runtime.js
diff --git a/core/admin/assets/lib/icheck/jquery.icheck.min.js b/core/client/assets/vendor/icheck/jquery.icheck.min.js
similarity index 100%
rename from core/admin/assets/lib/icheck/jquery.icheck.min.js
rename to core/client/assets/vendor/icheck/jquery.icheck.min.js
diff --git a/core/admin/assets/lib/jquery/jquery-ui-1.10.3.custom.min.js b/core/client/assets/vendor/jquery/jquery-ui-1.10.3.custom.min.js
similarity index 100%
rename from core/admin/assets/lib/jquery/jquery-ui-1.10.3.custom.min.js
rename to core/client/assets/vendor/jquery/jquery-ui-1.10.3.custom.min.js
diff --git a/core/admin/assets/lib/jquery/jquery.min.js b/core/client/assets/vendor/jquery/jquery.min.js
similarity index 100%
rename from core/admin/assets/lib/jquery/jquery.min.js
rename to core/client/assets/vendor/jquery/jquery.min.js
diff --git a/core/admin/assets/lib/moment.js b/core/client/assets/vendor/moment.js
similarity index 100%
rename from core/admin/assets/lib/moment.js
rename to core/client/assets/vendor/moment.js
diff --git a/core/admin/assets/lib/packery.pkgd.min.js b/core/client/assets/vendor/packery.pkgd.min.js
similarity index 100%
rename from core/admin/assets/lib/packery.pkgd.min.js
rename to core/client/assets/vendor/packery.pkgd.min.js
diff --git a/core/admin/assets/lib/shortcuts.js b/core/client/assets/vendor/shortcuts.js
similarity index 100%
rename from core/admin/assets/lib/shortcuts.js
rename to core/client/assets/vendor/shortcuts.js
diff --git a/core/admin/assets/lib/showdown/extensions/ghostdown.js b/core/client/assets/vendor/showdown/extensions/ghostdown.js
similarity index 100%
rename from core/admin/assets/lib/showdown/extensions/ghostdown.js
rename to core/client/assets/vendor/showdown/extensions/ghostdown.js
diff --git a/core/admin/assets/lib/showdown/showdown.js b/core/client/assets/vendor/showdown/showdown.js
similarity index 100%
rename from core/admin/assets/lib/showdown/showdown.js
rename to core/client/assets/vendor/showdown/showdown.js
diff --git a/core/admin/assets/lib/underscore.js b/core/client/assets/vendor/underscore.js
similarity index 100%
rename from core/admin/assets/lib/underscore.js
rename to core/client/assets/vendor/underscore.js
diff --git a/core/admin/assets/js/helpers/index.js b/core/client/helpers/index.js
similarity index 100%
rename from core/admin/assets/js/helpers/index.js
rename to core/client/helpers/index.js
diff --git a/core/admin/assets/js/init.js b/core/client/init.js
similarity index 100%
rename from core/admin/assets/js/init.js
rename to core/client/init.js
diff --git a/core/admin/assets/js/markdown-actions.js b/core/client/markdown-actions.js
similarity index 100%
rename from core/admin/assets/js/markdown-actions.js
rename to core/client/markdown-actions.js
diff --git a/core/admin/assets/js/models/post.js b/core/client/models/post.js
similarity index 100%
rename from core/admin/assets/js/models/post.js
rename to core/client/models/post.js
diff --git a/core/admin/assets/js/models/settings.js b/core/client/models/settings.js
similarity index 100%
rename from core/admin/assets/js/models/settings.js
rename to core/client/models/settings.js
diff --git a/core/admin/assets/js/models/widget.js b/core/client/models/widget.js
similarity index 100%
rename from core/admin/assets/js/models/widget.js
rename to core/client/models/widget.js
diff --git a/core/admin/assets/js/router.js b/core/client/router.js
similarity index 100%
rename from core/admin/assets/js/router.js
rename to core/client/router.js
diff --git a/core/admin/assets/js/tagui.js b/core/client/tagui.js
similarity index 100%
rename from core/admin/assets/js/tagui.js
rename to core/client/tagui.js
diff --git a/core/admin/assets/js/toggle.js b/core/client/toggle.js
similarity index 100%
rename from core/admin/assets/js/toggle.js
rename to core/client/toggle.js
diff --git a/core/admin/assets/tpl/list-item.hbs b/core/client/tpl/list-item.hbs
similarity index 100%
rename from core/admin/assets/tpl/list-item.hbs
rename to core/client/tpl/list-item.hbs
diff --git a/core/admin/assets/tpl/preview.hbs b/core/client/tpl/preview.hbs
similarity index 100%
rename from core/admin/assets/tpl/preview.hbs
rename to core/client/tpl/preview.hbs
diff --git a/core/admin/assets/tpl/widget.hbs b/core/client/tpl/widget.hbs
similarity index 100%
rename from core/admin/assets/tpl/widget.hbs
rename to core/client/tpl/widget.hbs
diff --git a/core/admin/assets/tpl/widgets/custom/instagram.hbs b/core/client/tpl/widgets/custom/instagram.hbs
similarity index 100%
rename from core/admin/assets/tpl/widgets/custom/instagram.hbs
rename to core/client/tpl/widgets/custom/instagram.hbs
diff --git a/core/admin/assets/tpl/widgets/custom/lastfm.hbs b/core/client/tpl/widgets/custom/lastfm.hbs
similarity index 100%
rename from core/admin/assets/tpl/widgets/custom/lastfm.hbs
rename to core/client/tpl/widgets/custom/lastfm.hbs
diff --git a/core/admin/assets/tpl/widgets/custom/popular-posts.hbs b/core/client/tpl/widgets/custom/popular-posts.hbs
similarity index 100%
rename from core/admin/assets/tpl/widgets/custom/popular-posts.hbs
rename to core/client/tpl/widgets/custom/popular-posts.hbs
diff --git a/core/admin/assets/tpl/widgets/custom/post-ideas.hbs b/core/client/tpl/widgets/custom/post-ideas.hbs
similarity index 100%
rename from core/admin/assets/tpl/widgets/custom/post-ideas.hbs
rename to core/client/tpl/widgets/custom/post-ideas.hbs
diff --git a/core/admin/assets/tpl/widgets/custom/time.hbs b/core/client/tpl/widgets/custom/time.hbs
similarity index 100%
rename from core/admin/assets/tpl/widgets/custom/time.hbs
rename to core/client/tpl/widgets/custom/time.hbs
diff --git a/core/admin/assets/tpl/widgets/custom/tweets.hbs b/core/client/tpl/widgets/custom/tweets.hbs
similarity index 100%
rename from core/admin/assets/tpl/widgets/custom/tweets.hbs
rename to core/client/tpl/widgets/custom/tweets.hbs
diff --git a/core/admin/assets/tpl/widgets/custom/upcoming-posts.hbs b/core/client/tpl/widgets/custom/upcoming-posts.hbs
similarity index 100%
rename from core/admin/assets/tpl/widgets/custom/upcoming-posts.hbs
rename to core/client/tpl/widgets/custom/upcoming-posts.hbs
diff --git a/core/admin/assets/tpl/widgets/default/blank.hbs b/core/client/tpl/widgets/default/blank.hbs
similarity index 100%
rename from core/admin/assets/tpl/widgets/default/blank.hbs
rename to core/client/tpl/widgets/default/blank.hbs
diff --git a/core/admin/assets/tpl/widgets/default/number.hbs b/core/client/tpl/widgets/default/number.hbs
similarity index 100%
rename from core/admin/assets/tpl/widgets/default/number.hbs
rename to core/client/tpl/widgets/default/number.hbs
diff --git a/core/admin/assets/js/views/base.js b/core/client/views/base.js
similarity index 100%
rename from core/admin/assets/js/views/base.js
rename to core/client/views/base.js
diff --git a/core/admin/assets/js/views/blog.js b/core/client/views/blog.js
similarity index 100%
rename from core/admin/assets/js/views/blog.js
rename to core/client/views/blog.js
diff --git a/core/admin/assets/js/views/dashboard.js b/core/client/views/dashboard.js
similarity index 100%
rename from core/admin/assets/js/views/dashboard.js
rename to core/client/views/dashboard.js
diff --git a/core/admin/assets/js/views/debug.js b/core/client/views/debug.js
similarity index 100%
rename from core/admin/assets/js/views/debug.js
rename to core/client/views/debug.js
diff --git a/core/admin/assets/js/views/editor.js b/core/client/views/editor.js
similarity index 100%
rename from core/admin/assets/js/views/editor.js
rename to core/client/views/editor.js
diff --git a/core/admin/assets/js/views/settings.js b/core/client/views/settings.js
similarity index 100%
rename from core/admin/assets/js/views/settings.js
rename to core/client/views/settings.js
diff --git a/core/ghost.js b/core/ghost.js
index 0d0e0b4bf8..47f2a458ef 100644
--- a/core/ghost.js
+++ b/core/ghost.js
@@ -5,7 +5,7 @@
 var config = require('./../config'),
     when = require('when'),
     express = require('express'),
-    errors = require('../core/shared/errorHandling'),
+    errors = require('./server/errorHandling'),
     fs = require('fs'),
     path = require('path'),
     hbs = require('express-hbs'),
@@ -13,9 +13,9 @@ var config = require('./../config'),
     _ = require('underscore'),
     Polyglot = require('node-polyglot'),
 
-    models = require('./shared/models'),
+    models = require('./server/models'),
 
-    requireTree = require('./shared/require-tree'),
+    requireTree = require('./server/require-tree'),
     themePath = path.resolve(__dirname + '../../content/themes'),
     pluginPath = path.resolve(__dirname + '../../content/plugins'),
     themeDirectories = requireTree(themePath),
@@ -100,11 +100,11 @@ Ghost = function () {
             },
             paths: function () {
                 return {
-                    'activeTheme':   __dirname + '/../content/' + config.themeDir + '/' + config.activeTheme + '/',
-                    'adminViews':    __dirname + '/admin/views/',
-                    'frontendViews': __dirname + '/frontend/views/',
-                    'lang':          __dirname + '/lang/',
-                    'availableThemes': instance.themeDirectories,
+                    'activeTheme':      __dirname + '/../content/' + config.themeDir + '/' + config.activeTheme + '/',
+                    'adminViews':       __dirname + '/server/views/',
+                    'helperTemplates':  __dirname + '/server/helpers/tpl/',
+                    'lang':             __dirname + '/shared/lang/',
+                    'availableThemes':  instance.themeDirectories,
                     'availablePlugins': instance.pluginDirectories
                 };
             }
@@ -179,7 +179,7 @@ Ghost.prototype.compileTemplate = function (templatePath) {
 
 Ghost.prototype.loadTemplate = function (name) {
     // TODO: allow themes to override these templates
-    var templatePath = path.join(this.paths().frontendViews, name + '.hbs');
+    var templatePath = path.join(this.paths().helperTemplates, name + '.hbs');
 
     return this.compileTemplate(templatePath);
 };
@@ -284,7 +284,9 @@ Ghost.prototype.initTheme = function (app) {
         } else {
             app.engine('hbs', hbs.express3({partialsDir: self.paths().adminViews + 'partials'}));
             app.set('views', self.paths().adminViews);
-            app.use('/core/admin/assets', express['static'](path.join(__dirname, '/admin/assets')));
+            app.use('/public', express['static'](path.join(__dirname, '/client/assets')));
+            app.use('/public', express['static'](path.join(__dirname, '/client')));
+
         }
         app.use(express['static'](self.paths().activeTheme));
         app.use('/content/images', express['static'](path.join(__dirname, '/../content/images')));
diff --git a/core/shared/api.js b/core/server/api.js
similarity index 100%
rename from core/shared/api.js
rename to core/server/api.js
diff --git a/core/admin/controllers/index.js b/core/server/controllers/admin.js
old mode 100755
new mode 100644
similarity index 97%
rename from core/admin/controllers/index.js
rename to core/server/controllers/admin.js
index 444c874392..f74b23346e
--- a/core/admin/controllers/index.js
+++ b/core/server/controllers/admin.js
@@ -1,12 +1,12 @@
 var Ghost = require('../../ghost'),
-    dataExport = require('../../shared/data/export'),
-    dataImport = require('../../shared/data/import'),
+    dataExport = require('../data/export'),
+    dataImport = require('../data/import'),
     _ = require('underscore'),
     fs = require('fs'),
     path = require('path'),
     when = require('when'),
     nodefn = require('when/node/function'),
-    api = require('../../shared/api'),
+    api = require('../api'),
 
     ghost = new Ghost(),
     dataProvider = ghost.dataProvider,
@@ -238,7 +238,7 @@ adminControllers = {
                     return migration.down();
                 }, function () {
                     // If no version in the DB, assume 001
-                    var migration = require("../../shared/data/migration/001");
+                    var migration = require(".././migration/001");
 
                     // Run the downward migration
                     return migration.down();
diff --git a/core/frontend/controllers/index.js b/core/server/controllers/frontend.js
similarity index 96%
rename from core/frontend/controllers/index.js
rename to core/server/controllers/frontend.js
index 45baf3797f..b0c5c32fd4 100644
--- a/core/frontend/controllers/index.js
+++ b/core/server/controllers/frontend.js
@@ -5,7 +5,7 @@
 /*global require, module */
 
 var Ghost = require('../../ghost'),
-    api = require('../../shared/api'),
+    api = require('../api'),
 
     ghost = new Ghost(),
     frontendControllers;
diff --git a/core/shared/data/export/001.js b/core/server/data/export/001.js
similarity index 100%
rename from core/shared/data/export/001.js
rename to core/server/data/export/001.js
diff --git a/core/shared/data/export/index.js b/core/server/data/export/index.js
similarity index 100%
rename from core/shared/data/export/index.js
rename to core/server/data/export/index.js
diff --git a/core/shared/data/fixtures/001.js b/core/server/data/fixtures/001.js
similarity index 100%
rename from core/shared/data/fixtures/001.js
rename to core/server/data/fixtures/001.js
diff --git a/core/shared/data/import/001.js b/core/server/data/import/001.js
similarity index 100%
rename from core/shared/data/import/001.js
rename to core/server/data/import/001.js
diff --git a/core/shared/data/import/index.js b/core/server/data/import/index.js
similarity index 100%
rename from core/shared/data/import/index.js
rename to core/server/data/import/index.js
diff --git a/core/shared/data/migration/001.js b/core/server/data/migration/001.js
similarity index 100%
rename from core/shared/data/migration/001.js
rename to core/server/data/migration/001.js
diff --git a/core/shared/errorHandling.js b/core/server/errorHandling.js
similarity index 100%
rename from core/shared/errorHandling.js
rename to core/server/errorHandling.js
diff --git a/core/frontend/filters/index.js b/core/server/filters/index.js
similarity index 100%
rename from core/frontend/filters/index.js
rename to core/server/filters/index.js
diff --git a/core/frontend/helpers/index.js b/core/server/helpers/index.js
similarity index 99%
rename from core/frontend/helpers/index.js
rename to core/server/helpers/index.js
index ae35c57443..c97e7117bd 100644
--- a/core/frontend/helpers/index.js
+++ b/core/server/helpers/index.js
@@ -2,7 +2,7 @@ var _ = require('underscore'),
     moment = require('moment'),
     when = require('when'),
     hbs = require('express-hbs'),
-    errors = require('../../shared/errorHandling'),
+    errors = require('../errorHandling'),
     coreHelpers;
 
 coreHelpers = function (ghost) {
diff --git a/core/frontend/views/nav.hbs b/core/server/helpers/tpl/nav.hbs
similarity index 100%
rename from core/frontend/views/nav.hbs
rename to core/server/helpers/tpl/nav.hbs
diff --git a/core/frontend/views/pagination.hbs b/core/server/helpers/tpl/pagination.hbs
similarity index 100%
rename from core/frontend/views/pagination.hbs
rename to core/server/helpers/tpl/pagination.hbs
diff --git a/core/shared/models/base.js b/core/server/models/base.js
similarity index 100%
rename from core/shared/models/base.js
rename to core/server/models/base.js
diff --git a/core/shared/models/index.js b/core/server/models/index.js
similarity index 100%
rename from core/shared/models/index.js
rename to core/server/models/index.js
diff --git a/core/shared/models/permission.js b/core/server/models/permission.js
similarity index 100%
rename from core/shared/models/permission.js
rename to core/server/models/permission.js
diff --git a/core/shared/models/post.js b/core/server/models/post.js
similarity index 100%
rename from core/shared/models/post.js
rename to core/server/models/post.js
diff --git a/core/shared/models/role.js b/core/server/models/role.js
similarity index 100%
rename from core/shared/models/role.js
rename to core/server/models/role.js
diff --git a/core/shared/models/settings.js b/core/server/models/settings.js
similarity index 100%
rename from core/shared/models/settings.js
rename to core/server/models/settings.js
diff --git a/core/shared/models/user.js b/core/server/models/user.js
similarity index 100%
rename from core/shared/models/user.js
rename to core/server/models/user.js
diff --git a/core/shared/permissions/index.js b/core/server/permissions/index.js
similarity index 100%
rename from core/shared/permissions/index.js
rename to core/server/permissions/index.js
diff --git a/core/shared/permissions/objectTypeModelMap.js b/core/server/permissions/objectTypeModelMap.js
similarity index 100%
rename from core/shared/permissions/objectTypeModelMap.js
rename to core/server/permissions/objectTypeModelMap.js
diff --git a/core/shared/require-tree.js b/core/server/require-tree.js
similarity index 100%
rename from core/shared/require-tree.js
rename to core/server/require-tree.js
diff --git a/core/admin/views/content.hbs b/core/server/views/content.hbs
similarity index 100%
rename from core/admin/views/content.hbs
rename to core/server/views/content.hbs
diff --git a/core/admin/views/dashboard.hbs b/core/server/views/dashboard.hbs
similarity index 92%
rename from core/admin/views/dashboard.hbs
rename to core/server/views/dashboard.hbs
index 361b1ac208..4ffdd5d5d5 100644
--- a/core/admin/views/dashboard.hbs
+++ b/core/server/views/dashboard.hbs
@@ -1,5 +1,5 @@
 {{#contentFor 'bodyScripts'}}
-    <script src="/core/admin/assets/lib/chart.min.js"></script>
+    <script src="/public/vendor/chart.min.js"></script>
     <script>
     $(document).ready(function(){
           var ctx = $("#poststats").get(0).getContext("2d");
diff --git a/core/admin/views/debug.hbs b/core/server/views/debug.hbs
similarity index 100%
rename from core/admin/views/debug.hbs
rename to core/server/views/debug.hbs
diff --git a/core/server/views/default.hbs b/core/server/views/default.hbs
new file mode 100644
index 0000000000..51ac5ae425
--- /dev/null
+++ b/core/server/views/default.hbs
@@ -0,0 +1,76 @@
+<!doctype html>
+<!--[if lt IE 7]><html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html class="no-js lt-ie9 lt-ie8" lang="en"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
+<!--[if (gte IE 9)| IEMobile |!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]-->
+    <head>
+        <meta charset="utf-8">
+
+        <title>{{siteTitle}}</title>
+        <meta name="description" content="{{siteDescription}}">
+        <meta name="author" content="">
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+
+        <link rel="shortcut icon" href="/favicon.ico">
+        <meta http-equiv="cleartype" content="on">
+
+        <link rel="stylesheet" type='text/css' href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,700'>
+        <link rel="stylesheet" href="/public/css/screen.css">
+        <link rel="stylesheet" type="text/css" href="/public/vendor/codemirror/codemirror.css"> <!-- TODO: Kill this - #29 -->
+        {{{block "pageStyles"}}}
+    </head>
+    <body class="{{bodyClass}}">
+        {{#unless hideNavbar}}
+            {{> navbar}}
+        {{/unless}}
+
+        <main role="main" id="main">
+            {{> flashes}}
+
+            {{{body}}}
+        </main>
+
+        <script src="/public/vendor/jquery/jquery.min.js"></script>
+        <script src="/public/vendor/icheck/jquery.icheck.min.js"></script>
+        <script src="/public/vendor/underscore.js"></script>
+        <script src="/public/vendor/backbone/backbone.js"></script>
+        <script src="/public/vendor/handlebars/handlebars-runtime.js"></script>
+        <script src="/public/vendor/codemirror/codemirror.js"></script>
+        <script src="/public/vendor/codemirror/mode/markdown/markdown.js"></script>
+        <script src="/public/vendor/showdown/showdown.js"></script>
+        <script src="/public/vendor/showdown/extensions/ghostdown.js"></script>
+        <script src="/public/vendor/shortcuts.js"></script>
+        <script src="/public/vendor/countable.js"></script>
+        <script src="/public/vendor/jquery/jquery-ui-1.10.3.custom.min.js"></script>
+        <script src="/public/vendor/packery.pkgd.min.js"></script>
+
+        <script src="/public/init.js"></script>
+        <script src="/public/tpl/hbs-tpl.js"></script>
+        <script src="/public/toggle.js"></script>
+        <script src="/public/admin-ui-temp.js"></script>
+        <script src="/public/markdown-actions.js"></script>
+        <script src="/public/tagui.js"></script>
+        <script src="/public/vendor/moment.js"></script>
+        <script src="/public/helpers/index.js"></script>
+
+        <!-- // require '/public/models/*' -->
+        <script src="/public/models/post.js"></script>
+        <script src="/public/models/widget.js"></script>
+        <script src="/public/models/settings.js"></script>
+        <!-- // require '/public/views/*' -->
+        <script src="/public/views/base.js"></script>
+        <script src="/public/views/dashboard.js"></script>
+        <script src="/public/views/blog.js"></script>
+        <script src="/public/views/editor.js"></script>
+        <script src="/public/views/settings.js"></script>
+        <script src="/public/views/debug.js"></script>
+        <script src="/public/router.js"></script>
+        {{{block "bodyScripts"}}}
+        <script>
+            Ghost.init();
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/core/admin/views/editor.hbs b/core/server/views/editor.hbs
similarity index 100%
rename from core/admin/views/editor.hbs
rename to core/server/views/editor.hbs
diff --git a/core/admin/views/login.hbs b/core/server/views/login.hbs
similarity index 100%
rename from core/admin/views/login.hbs
rename to core/server/views/login.hbs
diff --git a/core/admin/views/partials/flashes.hbs b/core/server/views/partials/flashes.hbs
similarity index 100%
rename from core/admin/views/partials/flashes.hbs
rename to core/server/views/partials/flashes.hbs
diff --git a/core/admin/views/partials/navbar.hbs b/core/server/views/partials/navbar.hbs
similarity index 92%
rename from core/admin/views/partials/navbar.hbs
rename to core/server/views/partials/navbar.hbs
index 40136a7fcd..ec50270b9a 100644
--- a/core/admin/views/partials/navbar.hbs
+++ b/core/server/views/partials/navbar.hbs
@@ -9,7 +9,7 @@
 
             <li id="usermenu" class="subnav">
                 <a href="#" data-toggle="ul" class="dropdown">
-                    <img class="avatar" src="/core/admin/assets/img/user.jpg" alt="Avatar" />
+                    <img class="avatar" src="/public/img/user.jpg" alt="Avatar" />
                     <span class="name">User Menu</span>
                 </a>
                 <ul class="overlay">
diff --git a/core/admin/views/settings.hbs b/core/server/views/settings.hbs
similarity index 95%
rename from core/admin/views/settings.hbs
rename to core/server/views/settings.hbs
index 43cfc52a00..f5e185dacf 100644
--- a/core/admin/views/settings.hbs
+++ b/core/server/views/settings.hbs
@@ -30,13 +30,13 @@
 
                     <label>
                         <b>Blog Logo</b>
-                        <img src="/core/admin/assets/img/logo.png" alt="logo" height="38" width="381"/>
+                        <img src="/core/client/assets/img/logo.png" alt="logo" height="38" width="381"/>
                         <p>Display a logo on your site in place of blog title</p>
                     </label>
 
                     <label>
                         <b>Blog Icon</b>
-                        <img src="/core/admin/assets/img/test-icon.png" alt="logo" height="38" width="38"/>
+                        <img src="/core/client/assets/img/test-icon.png" alt="logo" height="38" width="38"/>
                         <p>The icon for your blog, used in your browser tab and elsewhere</p>
                     </label>
 
@@ -184,7 +184,7 @@
                 <ul class="users">
                     <li class="user">
                         <figure class="user-image">
-                            <img src="/core/admin/assets/img/user.jpg" alt="user"/>
+                            <img src="/core/client/assets/img/user.jpg" alt="user"/>
                         </figure>
                         <section class="user-meta">
                             <h4 class="user-name">Some Name</h4>
@@ -194,7 +194,7 @@
                     </li>
                     <li class="user">
                         <figure class="user-image">
-                            <img src="/core/admin/assets/img/user.jpg" alt="user"/>
+                            <img src="/core/client/assets/img/user.jpg" alt="user"/>
                         </figure>
                         <section class="user-meta">
                             <h4 class="user-name">Some Name</h4>
diff --git a/core/admin/views/signup.hbs b/core/server/views/signup.hbs
old mode 100755
new mode 100644
similarity index 100%
rename from core/admin/views/signup.hbs
rename to core/server/views/signup.hbs
diff --git a/core/lang/en.json b/core/shared/lang/en.json
similarity index 100%
rename from core/lang/en.json
rename to core/shared/lang/en.json
diff --git a/core/lang/en_PL.json b/core/shared/lang/en_PL.json
similarity index 100%
rename from core/lang/en_PL.json
rename to core/shared/lang/en_PL.json
diff --git a/core/lang/i18n.js b/core/shared/lang/i18n.js
similarity index 100%
rename from core/lang/i18n.js
rename to core/shared/lang/i18n.js
diff --git a/core/test/ghost/api_permissions_spec.js b/core/test/ghost/api_permissions_spec.js
index dd40aeb81c..cfb0cb1709 100644
--- a/core/test/ghost/api_permissions_spec.js
+++ b/core/test/ghost/api_permissions_spec.js
@@ -1,8 +1,8 @@
 /*globals describe, it, beforeEach */
 var should = require('should'),
     helpers = require('./helpers'),
-    errors = require('../../shared/errorHandling'),
-    Models = require('../../shared/models');
+    errors = require('../../server/errorHandling'),
+    Models = require('../../server/models');
 
 describe("Role Model", function () {
 
diff --git a/core/test/ghost/api_posts_spec.js b/core/test/ghost/api_posts_spec.js
index a68031550a..086a257675 100644
--- a/core/test/ghost/api_posts_spec.js
+++ b/core/test/ghost/api_posts_spec.js
@@ -2,7 +2,7 @@
 var _ = require("underscore"),
     should = require('should'),
     helpers = require('./helpers'),
-    Models = require('../../shared/models');
+    Models = require('../../server/models');
 
 describe('Post Model', function () {
 
diff --git a/core/test/ghost/api_settings_spec.js b/core/test/ghost/api_settings_spec.js
index 97e349cbde..7b8b25893b 100644
--- a/core/test/ghost/api_settings_spec.js
+++ b/core/test/ghost/api_settings_spec.js
@@ -2,7 +2,7 @@
 var _ = require("underscore"),
     should = require('should'),
     helpers = require('./helpers'),
-    Models = require('../../shared/models');
+    Models = require('../../server/models');
 
 describe('Settings Model', function () {
 
diff --git a/core/test/ghost/api_users_spec.js b/core/test/ghost/api_users_spec.js
index 3ac95a2205..db613fa875 100644
--- a/core/test/ghost/api_users_spec.js
+++ b/core/test/ghost/api_users_spec.js
@@ -2,8 +2,8 @@
 var _ = require('underscore'),
     should = require('should'),
     helpers = require('./helpers'),
-    errors = require('../../shared/errorHandling'),
-    Models = require('../../shared/models'),
+    errors = require('../../server/errorHandling'),
+    Models = require('../../server/models');
     when = require('when');
 
 describe('User Model', function () {
diff --git a/core/test/ghost/errorHandling_spec.js b/core/test/ghost/errorHandling_spec.js
index 3edb7e0fc8..20c9e7f18c 100644
--- a/core/test/ghost/errorHandling_spec.js
+++ b/core/test/ghost/errorHandling_spec.js
@@ -2,7 +2,7 @@
 var should = require('should'),
     when = require('when'),
     sinon = require('sinon'),
-    errors = require('../../shared/errorHandling');
+    errors = require('../../server/errorHandling');
 
 describe("Error handling", function () {
 
diff --git a/core/test/ghost/export_spec.js b/core/test/ghost/export_spec.js
index 69c8ed6965..1a1d644541 100644
--- a/core/test/ghost/export_spec.js
+++ b/core/test/ghost/export_spec.js
@@ -4,9 +4,9 @@ var _ = require("underscore"),
     when = require('when'),
     sinon = require('sinon'),
     helpers = require('./helpers'),
-    exporter = require('../../shared/data/export'),
-    Exporter001 = require('../../shared/data/export/001'),
-    errors = require('../../shared/errorHandling');
+    exporter = require('../../server/data/export'),
+    Exporter001 = require('../../server/data/export/001'),
+    errors = require('../../server/errorHandling');
 
 describe("Export", function () {
 
diff --git a/core/test/ghost/frontend_helpers_index_spec.js b/core/test/ghost/frontend_helpers_index_spec.js
index 5306f599ce..c65414a90c 100644
--- a/core/test/ghost/frontend_helpers_index_spec.js
+++ b/core/test/ghost/frontend_helpers_index_spec.js
@@ -5,7 +5,7 @@ var should = require('should'),
     _ = require('underscore'),
     handlebars = require('express-hbs').handlebars,
     path = require('path'),
-    helpers = require('../../frontend/helpers'),
+    helpers = require('../../server/helpers'),
     Ghost = require('../../ghost');
 
 describe('Core Helpers', function () {
diff --git a/core/test/ghost/ghost_spec.js b/core/test/ghost/ghost_spec.js
index e509f3acd5..9d55549aff 100644
--- a/core/test/ghost/ghost_spec.js
+++ b/core/test/ghost/ghost_spec.js
@@ -117,7 +117,7 @@ describe("Ghost API", function () {
 
         // In order for the test to work, need to replace the path to the template
         ghost.paths = sinon.stub().returns({
-            frontendViews: path.join(process.cwd(), testTemplatePath)
+            helperTemplates: path.join(process.cwd(), testTemplatePath)
         });
 
         ghost.loadTemplate('test').then(function (templateFn) {
diff --git a/core/test/ghost/helpers.js b/core/test/ghost/helpers.js
index 500c79ed2c..682d6c459c 100644
--- a/core/test/ghost/helpers.js
+++ b/core/test/ghost/helpers.js
@@ -1,10 +1,10 @@
 // Use 'testing' Ghost config; unless we are running on travis (then show queries for debugging)
 process.env.NODE_ENV = process.env.TRAVIS ? 'travis' : 'testing';
 
-var knex = require('../../shared/models/base').Knex,
+var knex = require('../../server/models/base').Knex,
     when = require('when'),
     migrations = {
-        one: require("../../shared/data/migration/001")
+        one: require("../../server/data/migration/001")
     },
     helpers,
     samplePost,
diff --git a/core/test/ghost/import_spec.js b/core/test/ghost/import_spec.js
index e4de9777d4..1e0d527965 100644
--- a/core/test/ghost/import_spec.js
+++ b/core/test/ghost/import_spec.js
@@ -3,12 +3,12 @@ var _ = require("underscore"),
     should = require('should'),
     when = require('when'),
     sinon = require('sinon'),
-    knex = require("../../shared/models/base").Knex,
+    knex = require("../../server/models/base").Knex,
     helpers = require('./helpers'),
-    exporter = require('../../shared/data/export'),
-    importer = require('../../shared/data/import'),
-    Importer001 = require('../../shared/data/import/001'),
-    errors = require('../../shared/errorHandling');
+    exporter = require('../../server/data/export'),
+    importer = require('../../server/data/import'),
+    Importer001 = require('../../server/data/import/001'),
+    errors = require('../../server/errorHandling');
 
 describe("Import", function () {
 
diff --git a/core/test/ghost/permissions_spec.js b/core/test/ghost/permissions_spec.js
index fd64ff8a04..71ee254044 100644
--- a/core/test/ghost/permissions_spec.js
+++ b/core/test/ghost/permissions_spec.js
@@ -3,10 +3,10 @@ var _ = require("underscore"),
     when = require('when'),
     should = require('should'),
     sinon = require('sinon'),
-    errors = require('../../shared/errorHandling'),
+    errors = require('../../server/errorHandling'),
     helpers = require('./helpers'),
-    permissions = require('../../shared/permissions'),
-    Models = require('../../shared/models'),
+    permissions = require('../../server/permissions'),
+    Models = require('../../server/models'),
     UserProvider = Models.User,
     PermissionsProvider = Models.Permission,
     PostProvider = Models.Post;
diff --git a/index.js b/index.js
index 97a5ba5d3d..50e5155860 100644
--- a/index.js
+++ b/index.js
@@ -4,15 +4,15 @@
 var express = require('express'),
     when = require('when'),
     _ = require('underscore'),
-    errors = require('./core/shared/errorHandling'),
-    admin = require('./core/admin/controllers'),
-    frontend = require('./core/frontend/controllers'),
-    api = require('./core/shared/api'),
+    errors = require('./core/server/errorHandling'),
+    admin = require('./core/server/controllers/admin'),
+    frontend = require('./core/server/controllers/frontend'),
+    api = require('./core/server/api'),
     flash = require('connect-flash'),
     Ghost = require('./core/ghost'),
-    I18n = require('./core/lang/i18n'),
-    filters = require('./core/frontend/filters'),
-    helpers = require('./core/frontend/helpers'),
+    I18n = require('./core/shared/lang/i18n'),
+    filters = require('./core/server/filters'),
+    helpers = require('./core/server/helpers'),
 
 // ## Custom Middleware
     auth,