diff --git a/master/.htaccess b/.htaccess
similarity index 100%
rename from master/.htaccess
rename to .htaccess
diff --git a/master/app/.htaccess b/app/.htaccess
similarity index 100%
rename from master/app/.htaccess
rename to app/.htaccess
diff --git a/master/app/app_controller.php b/app/app_controller.php
similarity index 100%
rename from master/app/app_controller.php
rename to app/app_controller.php
diff --git a/master/app/app_helper.php b/app/app_helper.php
similarity index 100%
rename from master/app/app_helper.php
rename to app/app_helper.php
diff --git a/master/app/app_model.php b/app/app_model.php
similarity index 100%
rename from master/app/app_model.php
rename to app/app_model.php
diff --git a/master/app/config/acl.ini.php b/app/config/acl.ini.php
similarity index 100%
rename from master/app/config/acl.ini.php
rename to app/config/acl.ini.php
diff --git a/master/app/config/bootstrap.php b/app/config/bootstrap.php
similarity index 100%
rename from master/app/config/bootstrap.php
rename to app/config/bootstrap.php
diff --git a/master/app/config/core.php b/app/config/core.php
similarity index 100%
rename from master/app/config/core.php
rename to app/config/core.php
diff --git a/master/app/config/database.php.default b/app/config/database.php.default
similarity index 100%
rename from master/app/config/database.php.default
rename to app/config/database.php.default
diff --git a/master/app/config/routes.php b/app/config/routes.php
similarity index 100%
rename from master/app/config/routes.php
rename to app/config/routes.php
diff --git a/master/app/config/schema/db_acl.php b/app/config/schema/db_acl.php
similarity index 100%
rename from master/app/config/schema/db_acl.php
rename to app/config/schema/db_acl.php
diff --git a/master/app/config/schema/db_acl.sql b/app/config/schema/db_acl.sql
similarity index 100%
rename from master/app/config/schema/db_acl.sql
rename to app/config/schema/db_acl.sql
diff --git a/master/app/config/schema/i18n.php b/app/config/schema/i18n.php
similarity index 100%
rename from master/app/config/schema/i18n.php
rename to app/config/schema/i18n.php
diff --git a/master/app/config/schema/i18n.sql b/app/config/schema/i18n.sql
similarity index 100%
rename from master/app/config/schema/i18n.sql
rename to app/config/schema/i18n.sql
diff --git a/master/app/config/schema/sessions.php b/app/config/schema/sessions.php
similarity index 100%
rename from master/app/config/schema/sessions.php
rename to app/config/schema/sessions.php
diff --git a/master/app/config/schema/sessions.sql b/app/config/schema/sessions.sql
similarity index 100%
rename from master/app/config/schema/sessions.sql
rename to app/config/schema/sessions.sql
diff --git a/master/app/controllers/albums_controller.php b/app/controllers/albums_controller.php
similarity index 100%
rename from master/app/controllers/albums_controller.php
rename to app/controllers/albums_controller.php
diff --git a/master/app/controllers/contacts_app_controller.php b/app/controllers/contacts_app_controller.php
similarity index 100%
rename from master/app/controllers/contacts_app_controller.php
rename to app/controllers/contacts_app_controller.php
diff --git a/master/app/controllers/contacts_controller.php b/app/controllers/contacts_controller.php
similarity index 100%
rename from master/app/controllers/contacts_controller.php
rename to app/controllers/contacts_controller.php
diff --git a/master/app/controllers/images_controller.php b/app/controllers/images_controller.php
similarity index 100%
rename from master/app/controllers/images_controller.php
rename to app/controllers/images_controller.php
diff --git a/master/app/controllers/pages_controller.php b/app/controllers/pages_controller.php
similarity index 100%
rename from master/app/controllers/pages_controller.php
rename to app/controllers/pages_controller.php
diff --git a/master/app/controllers/photos_app_controller.php b/app/controllers/photos_app_controller.php
similarity index 100%
rename from master/app/controllers/photos_app_controller.php
rename to app/controllers/photos_app_controller.php
diff --git a/master/app/controllers/tasks_app_controller.php b/app/controllers/tasks_app_controller.php
similarity index 100%
rename from master/app/controllers/tasks_app_controller.php
rename to app/controllers/tasks_app_controller.php
diff --git a/master/app/controllers/tasks_controller.php b/app/controllers/tasks_controller.php
similarity index 100%
rename from master/app/controllers/tasks_controller.php
rename to app/controllers/tasks_controller.php
diff --git a/master/app/controllers/tests_controller.php b/app/controllers/tests_controller.php
similarity index 100%
rename from master/app/controllers/tests_controller.php
rename to app/controllers/tests_controller.php
diff --git a/master/app/controllers/todos_app_controller.php b/app/controllers/todos_app_controller.php
similarity index 100%
rename from master/app/controllers/todos_app_controller.php
rename to app/controllers/todos_app_controller.php
diff --git a/master/app/controllers/todos_controller.php b/app/controllers/todos_controller.php
similarity index 100%
rename from master/app/controllers/todos_controller.php
rename to app/controllers/todos_controller.php
diff --git a/master/app/index.php b/app/index.php
similarity index 100%
rename from master/app/index.php
rename to app/index.php
diff --git a/master/app/models/album.php b/app/models/album.php
similarity index 100%
rename from master/app/models/album.php
rename to app/models/album.php
diff --git a/master/app/models/albums_image.php b/app/models/albums_image.php
similarity index 100%
rename from master/app/models/albums_image.php
rename to app/models/albums_image.php
diff --git a/master/app/models/contact.php b/app/models/contact.php
similarity index 100%
rename from master/app/models/contact.php
rename to app/models/contact.php
diff --git a/master/app/models/image.php b/app/models/image.php
similarity index 100%
rename from master/app/models/image.php
rename to app/models/image.php
diff --git a/master/app/models/task.php b/app/models/task.php
similarity index 100%
rename from master/app/models/task.php
rename to app/models/task.php
diff --git a/master/app/models/test.php b/app/models/test.php
similarity index 100%
rename from master/app/models/test.php
rename to app/models/test.php
diff --git a/master/app/models/todo.php b/app/models/todo.php
similarity index 100%
rename from master/app/models/todo.php
rename to app/models/todo.php
diff --git a/master/app/views/contacts_app/index.ctp b/app/views/contacts_app/index.ctp
similarity index 100%
rename from master/app/views/contacts_app/index.ctp
rename to app/views/contacts_app/index.ctp
diff --git a/master/app/views/elements/email/html/default.ctp b/app/views/elements/email/html/default.ctp
similarity index 100%
rename from master/app/views/elements/email/html/default.ctp
rename to app/views/elements/email/html/default.ctp
diff --git a/master/app/views/elements/email/text/default.ctp b/app/views/elements/email/text/default.ctp
similarity index 100%
rename from master/app/views/elements/email/text/default.ctp
rename to app/views/elements/email/text/default.ctp
diff --git a/master/app/views/elements/simple_ajax.ctp b/app/views/elements/simple_ajax.ctp
similarity index 100%
rename from master/app/views/elements/simple_ajax.ctp
rename to app/views/elements/simple_ajax.ctp
diff --git a/master/app/views/elements/simple_json.ctp b/app/views/elements/simple_json.ctp
similarity index 100%
rename from master/app/views/elements/simple_json.ctp
rename to app/views/elements/simple_json.ctp
diff --git a/master/app/views/layouts/ajax.ctp b/app/views/layouts/ajax.ctp
similarity index 100%
rename from master/app/views/layouts/ajax.ctp
rename to app/views/layouts/ajax.ctp
diff --git a/master/app/views/layouts/contacts_app_layout.ctp b/app/views/layouts/contacts_app_layout.ctp
similarity index 100%
rename from master/app/views/layouts/contacts_app_layout.ctp
rename to app/views/layouts/contacts_app_layout.ctp
diff --git a/master/app/views/layouts/default.ctp b/app/views/layouts/default.ctp
similarity index 100%
rename from master/app/views/layouts/default.ctp
rename to app/views/layouts/default.ctp
diff --git a/master/app/views/layouts/email/html/default.ctp b/app/views/layouts/email/html/default.ctp
similarity index 100%
rename from master/app/views/layouts/email/html/default.ctp
rename to app/views/layouts/email/html/default.ctp
diff --git a/master/app/views/layouts/email/text/default.ctp b/app/views/layouts/email/text/default.ctp
similarity index 100%
rename from master/app/views/layouts/email/text/default.ctp
rename to app/views/layouts/email/text/default.ctp
diff --git a/master/app/views/layouts/flash.ctp b/app/views/layouts/flash.ctp
similarity index 100%
rename from master/app/views/layouts/flash.ctp
rename to app/views/layouts/flash.ctp
diff --git a/master/app/views/layouts/js/default.ctp b/app/views/layouts/js/default.ctp
similarity index 100%
rename from master/app/views/layouts/js/default.ctp
rename to app/views/layouts/js/default.ctp
diff --git a/master/app/views/layouts/photos_app_layout.ctp b/app/views/layouts/photos_app_layout.ctp
similarity index 100%
rename from master/app/views/layouts/photos_app_layout.ctp
rename to app/views/layouts/photos_app_layout.ctp
diff --git a/master/app/views/layouts/rss/default.ctp b/app/views/layouts/rss/default.ctp
similarity index 100%
rename from master/app/views/layouts/rss/default.ctp
rename to app/views/layouts/rss/default.ctp
diff --git a/master/app/views/layouts/tasks_layout.ctp b/app/views/layouts/tasks_layout.ctp
similarity index 100%
rename from master/app/views/layouts/tasks_layout.ctp
rename to app/views/layouts/tasks_layout.ctp
diff --git a/master/app/views/layouts/todos_layout.ctp b/app/views/layouts/todos_layout.ctp
similarity index 100%
rename from master/app/views/layouts/todos_layout.ctp
rename to app/views/layouts/todos_layout.ctp
diff --git a/master/app/views/layouts/xml/default.ctp b/app/views/layouts/xml/default.ctp
similarity index 100%
rename from master/app/views/layouts/xml/default.ctp
rename to app/views/layouts/xml/default.ctp
diff --git a/master/app/views/pages/home.ctp b/app/views/pages/home.ctp
similarity index 100%
rename from master/app/views/pages/home.ctp
rename to app/views/pages/home.ctp
diff --git a/master/app/views/pages/home.default.ctp b/app/views/pages/home.default.ctp
similarity index 100%
rename from master/app/views/pages/home.default.ctp
rename to app/views/pages/home.default.ctp
diff --git a/master/app/views/pages/home.ko.ctp b/app/views/pages/home.ko.ctp
similarity index 100%
rename from master/app/views/pages/home.ko.ctp
rename to app/views/pages/home.ko.ctp
diff --git a/master/app/views/photos_app/index.ctp b/app/views/photos_app/index.ctp
similarity index 100%
rename from master/app/views/photos_app/index.ctp
rename to app/views/photos_app/index.ctp
diff --git a/master/app/views/tasks_app/index.ctp b/app/views/tasks_app/index.ctp
similarity index 100%
rename from master/app/views/tasks_app/index.ctp
rename to app/views/tasks_app/index.ctp
diff --git a/master/app/views/tests/add.ctp b/app/views/tests/add.ctp
similarity index 100%
rename from master/app/views/tests/add.ctp
rename to app/views/tests/add.ctp
diff --git a/master/app/views/tests/edit.ctp b/app/views/tests/edit.ctp
similarity index 100%
rename from master/app/views/tests/edit.ctp
rename to app/views/tests/edit.ctp
diff --git a/master/app/views/tests/index.ctp b/app/views/tests/index.ctp
similarity index 100%
rename from master/app/views/tests/index.ctp
rename to app/views/tests/index.ctp
diff --git a/master/app/views/tests/view.ctp b/app/views/tests/view.ctp
similarity index 100%
rename from master/app/views/tests/view.ctp
rename to app/views/tests/view.ctp
diff --git a/master/app/views/todos/add.ctp b/app/views/todos/add.ctp
similarity index 100%
rename from master/app/views/todos/add.ctp
rename to app/views/todos/add.ctp
diff --git a/master/app/views/todos/edit.ctp b/app/views/todos/edit.ctp
similarity index 100%
rename from master/app/views/todos/edit.ctp
rename to app/views/todos/edit.ctp
diff --git a/master/app/views/todos/index.ctp b/app/views/todos/index.ctp
similarity index 100%
rename from master/app/views/todos/index.ctp
rename to app/views/todos/index.ctp
diff --git a/master/app/views/todos/index_.ctp b/app/views/todos/index_.ctp
similarity index 100%
rename from master/app/views/todos/index_.ctp
rename to app/views/todos/index_.ctp
diff --git a/master/app/views/todos/view.ctp b/app/views/todos/view.ctp
similarity index 100%
rename from master/app/views/todos/view.ctp
rename to app/views/todos/view.ctp
diff --git a/master/app/views/todos_app/index.ctp b/app/views/todos_app/index.ctp
similarity index 100%
rename from master/app/views/todos_app/index.ctp
rename to app/views/todos_app/index.ctp
diff --git a/master/app/webroot/.htaccess b/app/webroot/.htaccess
similarity index 100%
rename from master/app/webroot/.htaccess
rename to app/webroot/.htaccess
diff --git a/master/app/webroot/css.php b/app/webroot/css.php
similarity index 100%
rename from master/app/webroot/css.php
rename to app/webroot/css.php
diff --git a/master/app/webroot/css/application.css b/app/webroot/css/application.css
similarity index 100%
rename from master/app/webroot/css/application.css
rename to app/webroot/css/application.css
diff --git a/master/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
similarity index 100%
rename from master/app/webroot/css/cake.generic.css
rename to app/webroot/css/cake.generic.css
diff --git a/master/app/webroot/css/contacts/application.css b/app/webroot/css/contacts/application.css
similarity index 100%
rename from master/app/webroot/css/contacts/application.css
rename to app/webroot/css/contacts/application.css
diff --git a/master/app/webroot/css/img/bttn_primary_lg.gif b/app/webroot/css/img/bttn_primary_lg.gif
similarity index 100%
rename from master/app/webroot/css/img/bttn_primary_lg.gif
rename to app/webroot/css/img/bttn_primary_lg.gif
diff --git a/master/app/webroot/css/img/destroy.png b/app/webroot/css/img/destroy.png
similarity index 100%
rename from master/app/webroot/css/img/destroy.png
rename to app/webroot/css/img/destroy.png
diff --git a/master/app/webroot/css/img/icons.png b/app/webroot/css/img/icons.png
similarity index 100%
rename from master/app/webroot/css/img/icons.png
rename to app/webroot/css/img/icons.png
diff --git a/master/app/webroot/css/photos/application.css b/app/webroot/css/photos/application.css
similarity index 100%
rename from master/app/webroot/css/photos/application.css
rename to app/webroot/css/photos/application.css
diff --git a/master/app/webroot/css/todos.css b/app/webroot/css/todos.css
similarity index 100%
rename from master/app/webroot/css/todos.css
rename to app/webroot/css/todos.css
diff --git a/master/app/webroot/favicon.ico b/app/webroot/favicon.ico
similarity index 100%
rename from master/app/webroot/favicon.ico
rename to app/webroot/favicon.ico
diff --git a/master/app/webroot/img/cake.icon.png b/app/webroot/img/cake.icon.png
similarity index 100%
rename from master/app/webroot/img/cake.icon.png
rename to app/webroot/img/cake.icon.png
diff --git a/master/app/webroot/img/cake.power.gif b/app/webroot/img/cake.power.gif
similarity index 100%
rename from master/app/webroot/img/cake.power.gif
rename to app/webroot/img/cake.power.gif
diff --git a/master/app/webroot/img/missing.png b/app/webroot/img/missing.png
similarity index 100%
rename from master/app/webroot/img/missing.png
rename to app/webroot/img/missing.png
diff --git a/master/app/webroot/index.php b/app/webroot/index.php
similarity index 100%
rename from master/app/webroot/index.php
rename to app/webroot/index.php
diff --git a/master/app/webroot/js/backbone/app/todos/app.intro.js b/app/webroot/js/backbone/app/todos/app.intro.js
similarity index 100%
rename from master/app/webroot/js/backbone/app/todos/app.intro.js
rename to app/webroot/js/backbone/app/todos/app.intro.js
diff --git a/master/app/webroot/js/backbone/app/todos/application.js b/app/webroot/js/backbone/app/todos/application.js
similarity index 100%
rename from master/app/webroot/js/backbone/app/todos/application.js
rename to app/webroot/js/backbone/app/todos/application.js
diff --git a/master/app/webroot/js/backbone/lib/backbone-localstorage.js b/app/webroot/js/backbone/lib/backbone-localstorage.js
similarity index 100%
rename from master/app/webroot/js/backbone/lib/backbone-localstorage.js
rename to app/webroot/js/backbone/lib/backbone-localstorage.js
diff --git a/master/app/webroot/js/backbone/lib/backbone.debug.js b/app/webroot/js/backbone/lib/backbone.debug.js
similarity index 100%
rename from master/app/webroot/js/backbone/lib/backbone.debug.js
rename to app/webroot/js/backbone/lib/backbone.debug.js
diff --git a/master/app/webroot/js/knockout/app/app.ko.js b/app/webroot/js/knockout/app/app.ko.js
similarity index 100%
rename from master/app/webroot/js/knockout/app/app.ko.js
rename to app/webroot/js/knockout/app/app.ko.js
diff --git a/master/app/webroot/js/knockout/knockout-1.2.0.debug.js b/app/webroot/js/knockout/knockout-1.2.0.debug.js
similarity index 100%
rename from master/app/webroot/js/knockout/knockout-1.2.0.debug.js
rename to app/webroot/js/knockout/knockout-1.2.0.debug.js
diff --git a/master/app/webroot/js/lib/class.js b/app/webroot/js/lib/class.js
similarity index 100%
rename from master/app/webroot/js/lib/class.js
rename to app/webroot/js/lib/class.js
diff --git a/master/app/webroot/js/lib/jquery-1.6.1.js b/app/webroot/js/lib/jquery-1.6.1.js
similarity index 100%
rename from master/app/webroot/js/lib/jquery-1.6.1.js
rename to app/webroot/js/lib/jquery-1.6.1.js
diff --git a/master/app/webroot/js/lib/jquery.link.js b/app/webroot/js/lib/jquery.link.js
similarity index 100%
rename from master/app/webroot/js/lib/jquery.link.js
rename to app/webroot/js/lib/jquery.link.js
diff --git a/master/app/webroot/js/lib/jquery.tmpl.js b/app/webroot/js/lib/jquery.tmpl.js
similarity index 100%
rename from master/app/webroot/js/lib/jquery.tmpl.js
rename to app/webroot/js/lib/jquery.tmpl.js
diff --git a/master/app/webroot/js/lib/jquery.ui.core.js b/app/webroot/js/lib/jquery.ui.core.js
similarity index 100%
rename from master/app/webroot/js/lib/jquery.ui.core.js
rename to app/webroot/js/lib/jquery.ui.core.js
diff --git a/master/app/webroot/js/lib/jquery.ui.mouse.js b/app/webroot/js/lib/jquery.ui.mouse.js
similarity index 100%
rename from master/app/webroot/js/lib/jquery.ui.mouse.js
rename to app/webroot/js/lib/jquery.ui.mouse.js
diff --git a/master/app/webroot/js/lib/jquery.ui.position.js b/app/webroot/js/lib/jquery.ui.position.js
similarity index 100%
rename from master/app/webroot/js/lib/jquery.ui.position.js
rename to app/webroot/js/lib/jquery.ui.position.js
diff --git a/master/app/webroot/js/lib/jquery.ui.sortable.js b/app/webroot/js/lib/jquery.ui.sortable.js
similarity index 100%
rename from master/app/webroot/js/lib/jquery.ui.sortable.js
rename to app/webroot/js/lib/jquery.ui.sortable.js
diff --git a/master/app/webroot/js/lib/jquery.ui.widget.js b/app/webroot/js/lib/jquery.ui.widget.js
similarity index 100%
rename from master/app/webroot/js/lib/jquery.ui.widget.js
rename to app/webroot/js/lib/jquery.ui.widget.js
diff --git a/master/app/webroot/js/lib/json2.js b/app/webroot/js/lib/json2.js
similarity index 100%
rename from master/app/webroot/js/lib/json2.js
rename to app/webroot/js/lib/json2.js
diff --git a/master/app/webroot/js/lib/mootools-more.js b/app/webroot/js/lib/mootools-more.js
similarity index 100%
rename from master/app/webroot/js/lib/mootools-more.js
rename to app/webroot/js/lib/mootools-more.js
diff --git a/master/app/webroot/js/lib/mootools.js b/app/webroot/js/lib/mootools.js
similarity index 100%
rename from master/app/webroot/js/lib/mootools.js
rename to app/webroot/js/lib/mootools.js
diff --git a/master/app/webroot/js/lib/require.js b/app/webroot/js/lib/require.js
similarity index 100%
rename from master/app/webroot/js/lib/require.js
rename to app/webroot/js/lib/require.js
diff --git a/master/app/webroot/js/lib/underscore.debug.js b/app/webroot/js/lib/underscore.debug.js
similarity index 100%
rename from master/app/webroot/js/lib/underscore.debug.js
rename to app/webroot/js/lib/underscore.debug.js
diff --git a/master/app/webroot/js/spine/app/contacts/application.js b/app/webroot/js/spine/app/contacts/application.js
similarity index 100%
rename from master/app/webroot/js/spine/app/contacts/application.js
rename to app/webroot/js/spine/app/contacts/application.js
diff --git a/master/app/webroot/js/spine/app/contacts/controllers/contacts.js b/app/webroot/js/spine/app/contacts/controllers/contacts.js
similarity index 100%
rename from master/app/webroot/js/spine/app/contacts/controllers/contacts.js
rename to app/webroot/js/spine/app/contacts/controllers/contacts.js
diff --git a/master/app/webroot/js/spine/app/contacts/controllers/sidebar.js b/app/webroot/js/spine/app/contacts/controllers/sidebar.js
similarity index 100%
rename from master/app/webroot/js/spine/app/contacts/controllers/sidebar.js
rename to app/webroot/js/spine/app/contacts/controllers/sidebar.js
diff --git a/master/app/webroot/js/spine/app/contacts/models/contact.js b/app/webroot/js/spine/app/contacts/models/contact.js
similarity index 100%
rename from master/app/webroot/js/spine/app/contacts/models/contact.js
rename to app/webroot/js/spine/app/contacts/models/contact.js
diff --git a/master/app/webroot/js/spine/app/contacts/views/contact.html b/app/webroot/js/spine/app/contacts/views/contact.html
similarity index 100%
rename from master/app/webroot/js/spine/app/contacts/views/contact.html
rename to app/webroot/js/spine/app/contacts/views/contact.html
diff --git a/master/app/webroot/js/spine/app/contacts/views/contacts.html b/app/webroot/js/spine/app/contacts/views/contacts.html
similarity index 100%
rename from master/app/webroot/js/spine/app/contacts/views/contacts.html
rename to app/webroot/js/spine/app/contacts/views/contacts.html
diff --git a/master/app/webroot/js/spine/app/contacts/views/edit_contact.html b/app/webroot/js/spine/app/contacts/views/edit_contact.html
similarity index 100%
rename from master/app/webroot/js/spine/app/contacts/views/edit_contact.html
rename to app/webroot/js/spine/app/contacts/views/edit_contact.html
diff --git a/master/app/webroot/js/spine/app/fluxiom/assets.js b/app/webroot/js/spine/app/fluxiom/assets.js
similarity index 100%
rename from master/app/webroot/js/spine/app/fluxiom/assets.js
rename to app/webroot/js/spine/app/fluxiom/assets.js
diff --git a/master/app/webroot/js/spine/app/photos/application.js b/app/webroot/js/spine/app/photos/application.js
similarity index 100%
rename from master/app/webroot/js/spine/app/photos/application.js
rename to app/webroot/js/spine/app/photos/application.js
diff --git a/master/app/webroot/js/spine/app/photos/controllers/images.js b/app/webroot/js/spine/app/photos/controllers/images.js
similarity index 100%
rename from master/app/webroot/js/spine/app/photos/controllers/images.js
rename to app/webroot/js/spine/app/photos/controllers/images.js
diff --git a/master/app/webroot/js/spine/app/photos/controllers/newEmptyPHP.php b/app/webroot/js/spine/app/photos/controllers/newEmptyPHP.php
similarity index 100%
rename from master/app/webroot/js/spine/app/photos/controllers/newEmptyPHP.php
rename to app/webroot/js/spine/app/photos/controllers/newEmptyPHP.php
diff --git a/master/app/webroot/js/spine/app/photos/controllers/sidebar.js b/app/webroot/js/spine/app/photos/controllers/sidebar.js
similarity index 100%
rename from master/app/webroot/js/spine/app/photos/controllers/sidebar.js
rename to app/webroot/js/spine/app/photos/controllers/sidebar.js
diff --git a/master/app/webroot/js/spine/app/photos/models/image.js b/app/webroot/js/spine/app/photos/models/image.js
similarity index 100%
rename from master/app/webroot/js/spine/app/photos/models/image.js
rename to app/webroot/js/spine/app/photos/models/image.js
diff --git a/master/app/webroot/js/spine/app/todos/application.js b/app/webroot/js/spine/app/todos/application.js
similarity index 100%
rename from master/app/webroot/js/spine/app/todos/application.js
rename to app/webroot/js/spine/app/todos/application.js
diff --git a/master/app/webroot/js/spine/app/todos/models/task.js b/app/webroot/js/spine/app/todos/models/task.js
similarity index 100%
rename from master/app/webroot/js/spine/app/todos/models/task.js
rename to app/webroot/js/spine/app/todos/models/task.js
diff --git a/master/app/webroot/js/spine/lib/jquery.link.js b/app/webroot/js/spine/lib/jquery.link.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/jquery.link.js
rename to app/webroot/js/spine/lib/jquery.link.js
diff --git a/master/app/webroot/js/spine/lib/spine.ajax.js b/app/webroot/js/spine/lib/spine.ajax.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.ajax.js
rename to app/webroot/js/spine/lib/spine.ajax.js
diff --git a/master/app/webroot/js/spine/lib/spine.js b/app/webroot/js/spine/lib/spine.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.js
rename to app/webroot/js/spine/lib/spine.js
diff --git a/master/app/webroot/js/spine/lib/spine.list.js b/app/webroot/js/spine/lib/spine.list.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.list.js
rename to app/webroot/js/spine/lib/spine.list.js
diff --git a/master/app/webroot/js/spine/lib/spine.local.js b/app/webroot/js/spine/lib/spine.local.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.local.js
rename to app/webroot/js/spine/lib/spine.local.js
diff --git a/master/app/webroot/js/spine/lib/spine.manager.js b/app/webroot/js/spine/lib/spine.manager.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.manager.js
rename to app/webroot/js/spine/lib/spine.manager.js
diff --git a/master/app/webroot/js/spine/lib/spine.model.ajax.js b/app/webroot/js/spine/lib/spine.model.ajax.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.model.ajax.js
rename to app/webroot/js/spine/lib/spine.model.ajax.js
diff --git a/master/app/webroot/js/spine/lib/spine.model.filter.js b/app/webroot/js/spine/lib/spine.model.filter.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.model.filter.js
rename to app/webroot/js/spine/lib/spine.model.filter.js
diff --git a/master/app/webroot/js/spine/lib/spine.model.local.js b/app/webroot/js/spine/lib/spine.model.local.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.model.local.js
rename to app/webroot/js/spine/lib/spine.model.local.js
diff --git a/master/app/webroot/js/spine/lib/spine.route.js b/app/webroot/js/spine/lib/spine.route.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.route.js
rename to app/webroot/js/spine/lib/spine.route.js
diff --git a/master/app/webroot/js/spine/lib/spine.route.shim.js b/app/webroot/js/spine/lib/spine.route.shim.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.route.shim.js
rename to app/webroot/js/spine/lib/spine.route.shim.js
diff --git a/master/app/webroot/js/spine/lib/spine.tabs.js b/app/webroot/js/spine/lib/spine.tabs.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.tabs.js
rename to app/webroot/js/spine/lib/spine.tabs.js
diff --git a/master/app/webroot/js/spine/lib/spine.tmpl.js b/app/webroot/js/spine/lib/spine.tmpl.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/spine.tmpl.js
rename to app/webroot/js/spine/lib/spine.tmpl.js
diff --git a/master/app/webroot/js/spine/lib/utils.js b/app/webroot/js/spine/lib/utils.js
similarity index 100%
rename from master/app/webroot/js/spine/lib/utils.js
rename to app/webroot/js/spine/lib/utils.js
diff --git a/master/app/webroot/test.php b/app/webroot/test.php
similarity index 100%
rename from master/app/webroot/test.php
rename to app/webroot/test.php
diff --git a/master/index.html b/index.html
similarity index 100%
rename from master/index.html
rename to index.html
diff --git a/master/index.php b/index.php
similarity index 100%
rename from master/index.php
rename to index.php