opencomponents · mattiaerre · Apr 29, 2016 · Apr 29, 2016
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![oc](https://raw.github.com/opentable/oc/master/logo.png)
+![oc](https://raw.github.com/opentable/oc/master/docs/logo.png)
 =============
 
 OpenComponents is a framework to develop and deploy robust and distributed html components.

diff --git a/logo.png → docs/logo.png b/logo.png → docs/logo.png
diff --git a/grunt-tasks/jshint.js b/grunt-tasks/jshint.js
@@ -2,15 +2,15 @@
 
 module.exports = {
   options: {
-    jshintrc: '.jshintrc',
+    jshintrc: 'grunt-tasks/support/.jshintrc',
     ignores: [
       'node_modules', 
       'client/src/oc-client.min.js', 
-      'components/oc-client/src/head.load.js', 
-      'components/oc-client/src/oc-client.min.js', 
-      'components/oc-client/_package/**/*', 
-      'components/base-component-handlebars/_package/**/*',
-      'components/base-component-jade/_package/**/*',
+      'src/components/oc-client/src/head.load.js', 
+      'src/components/oc-client/src/oc-client.min.js', 
+      'src/components/oc-client/_package/**/*', 
+      'src/components/base-component-handlebars/_package/**/*',
+      'src/components/base-component-jade/_package/**/*',
       'test/fixtures',
       'test/front-end',
       'test/configuration'

diff --git a/.jshintrc → grunt-tasks/support/.jshintrc b/.jshintrc → grunt-tasks/support/.jshintrc
diff --git a/grunt-tasks/support/cli-commands-parser.js b/grunt-tasks/support/cli-commands-parser.js
@@ -2,7 +2,7 @@
 
 var _ = require('underscore');
 
-var commands = require('../../cli/commands');
+var commands = require('../../src/cli/commands');
 
 module.exports = {
   parse: function(){

diff --git a/grunt-tasks/support/task-build.js b/grunt-tasks/support/task-build.js
@@ -11,9 +11,9 @@ module.exports = function(grunt, taskObject){
 
     var done = this.async(),
         version = taskObject.pkg.version,
-        clientComponentDir = '../../components/oc-client/',
+        clientComponentDir = '../../src/components/oc-client/',
         licenseRow = '/*! OpenComponents client v{0} | (c) 2015-{1} OpenTable, Inc. | {2} */',
-        licenseLink = 'https://github.com/opentable/oc/tree/master/components/oc-client/LICENSES',
+        licenseLink = 'https://github.com/opentable/oc/tree/master/src/components/oc-client/LICENSES',
         license = format(licenseRow, version, new Date().getFullYear(), licenseLink),
         headLoad = fs.readFileSync(path.join(__dirname, clientComponentDir, 'src/head.load.js')).toString(),
         ocClient = fs.readFileSync(path.join(__dirname, clientComponentDir, 'src/oc-client.js')).toString(),
@@ -34,7 +34,7 @@ module.exports = function(grunt, taskObject){
     fs.writeFileSync(path.join(__dirname, clientComponentDir, 'src/oc-client.min.map'), compressed.map);
     fs.writeFileSync(path.join(__dirname, '../../client/src/oc-client.min.js'), compressedCode);
 
-    var Local = require('../../cli/domain/local'),
+    var Local = require('../../src/cli/domain/local'),
         local = new Local({ logger: { log: grunt.log.writeln }});
 
     local.package(path.join(__dirname, clientComponentDir), function(err, res){

diff --git a/package.json b/package.json
@@ -2,9 +2,9 @@
   "name": "oc",
   "version": "0.30.2",
   "description": "A framework for developing and distributing html components",
-  "main": "index.js",
+  "main": "./src/index.js",
   "bin": {
-    "oc": "./oc-cli.js"
+    "oc": "./src/oc-cli.js"
   },
   "scripts": {
     "test": "grunt test"

diff --git a/cli/autocomplete.js → src/cli/autocomplete.js b/cli/autocomplete.js → src/cli/autocomplete.js
diff --git a/cli/commands.js → src/cli/commands.js b/cli/commands.js → src/cli/commands.js
diff --git a/cli/domain/get-components-by-dir.js → src/cli/domain/get-components-by-dir.js b/cli/domain/get-components-by-dir.js → src/cli/domain/get-components-by-dir.js
diff --git a/cli/domain/get-components-deps.js → src/cli/domain/get-components-deps.js b/cli/domain/get-components-deps.js → src/cli/domain/get-components-deps.js
diff --git a/cli/domain/get-local-npm-modules.js → src/cli/domain/get-local-npm-modules.js b/cli/domain/get-local-npm-modules.js → src/cli/domain/get-local-npm-modules.js
diff --git a/cli/domain/get-missing-deps.js → src/cli/domain/get-missing-deps.js b/cli/domain/get-missing-deps.js → src/cli/domain/get-missing-deps.js
diff --git a/cli/domain/get-mocked-plugins.js → src/cli/domain/get-mocked-plugins.js b/cli/domain/get-mocked-plugins.js → src/cli/domain/get-mocked-plugins.js
diff --git a/cli/domain/local.js → src/cli/domain/local.js b/cli/domain/local.js → src/cli/domain/local.js
diff --git a/cli/domain/mock.js → src/cli/domain/mock.js b/cli/domain/mock.js → src/cli/domain/mock.js
diff --git a/cli/domain/npm-installer.js → src/cli/domain/npm-installer.js b/cli/domain/npm-installer.js → src/cli/domain/npm-installer.js
diff --git a/cli/domain/package-components.js → src/cli/domain/package-components.js b/cli/domain/package-components.js → src/cli/domain/package-components.js
@@ -29,7 +29,7 @@ module.exports = function(){
     fs.mkdirSync(publishPath);
 
     var componentPackagePath = path.join(componentPath, 'package.json'),
-        ocPackagePath = path.join(__dirname, '../../package.json');
+        ocPackagePath = path.join(__dirname, '../../../package.json');
 
     if(!fs.existsSync(componentPackagePath)){
       return callback(new Error('component does not contain package.json'));

diff --git a/cli/domain/package-server-script.js → src/cli/domain/package-server-script.js b/cli/domain/package-server-script.js → src/cli/domain/package-server-script.js
diff --git a/cli/domain/package-static-files.js → src/cli/domain/package-static-files.js b/cli/domain/package-static-files.js → src/cli/domain/package-static-files.js
diff --git a/cli/domain/package-template.js → src/cli/domain/package-template.js b/cli/domain/package-template.js → src/cli/domain/package-template.js
diff --git a/cli/domain/registry.js → src/cli/domain/registry.js b/cli/domain/registry.js → src/cli/domain/registry.js
@@ -13,7 +13,7 @@ var urlParser = require('../domain/url-parser');
 
 var getOcVersion = function(){
 
-  var ocPackagePath = path.join(__dirname, '../../package.json'),
+  var ocPackagePath = path.join(__dirname, '../../../package.json'),
       ocInfo = fs.readJsonSync(ocPackagePath);
 
   return ocInfo.version;

diff --git a/cli/domain/url-parser.js → src/cli/domain/url-parser.js b/cli/domain/url-parser.js → src/cli/domain/url-parser.js
diff --git a/cli/domain/watch.js → src/cli/domain/watch.js b/cli/domain/watch.js → src/cli/domain/watch.js
diff --git a/cli/facade/dev.js → src/cli/facade/dev.js b/cli/facade/dev.js → src/cli/facade/dev.js
diff --git a/cli/facade/init.js → src/cli/facade/init.js b/cli/facade/init.js → src/cli/facade/init.js
diff --git a/cli/facade/mock.js → src/cli/facade/mock.js b/cli/facade/mock.js → src/cli/facade/mock.js
diff --git a/cli/facade/preview.js → src/cli/facade/preview.js b/cli/facade/preview.js → src/cli/facade/preview.js
diff --git a/cli/facade/publish.js → src/cli/facade/publish.js b/cli/facade/publish.js → src/cli/facade/publish.js
diff --git a/cli/facade/registry.js → src/cli/facade/registry.js b/cli/facade/registry.js → src/cli/facade/registry.js
diff --git a/cli/facade/version.js → src/cli/facade/version.js b/cli/facade/version.js → src/cli/facade/version.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var packageInfo = require('../../package.json');
+var packageInfo = require('../../../package.json');
 
 module.exports = function(dependencies){
   return function(){

diff --git a/cli/index.js → src/cli/index.js b/cli/index.js → src/cli/index.js
diff --git a/cli/wrap-cli-callback.js → src/cli/wrap-cli-callback.js b/cli/wrap-cli-callback.js → src/cli/wrap-cli-callback.js
diff --git a/...ents/base-component-handlebars/.npmignore → ...ents/base-component-handlebars/.npmignore b/...ents/base-component-handlebars/.npmignore → ...ents/base-component-handlebars/.npmignore
diff --git a/src/components/base-component-handlebars/_package/package.json b/src/components/base-component-handlebars/_package/package.json
@@ -0,0 +1 @@
+{"name":"base-component-handlebars","description":"","version":"1.0.0","repository":"","oc":{"files":{"template":{"type":"handlebars","hashKey":"a34cffd0625f1eb8a08569f068cd4a9768104a91","src":"template.js"},"dataProvider":{"type":"node.js","hashKey":"c9286a76c6600084f39b7cb129c97b4bddb1dd03","src":"server.js"},"static":[]},"version":"0.30.2","packaged":true,"date":1461887688441}}
diff --git a/src/components/base-component-handlebars/_package/server.js b/src/components/base-component-handlebars/_package/server.js
@@ -0,0 +1 @@
+"use strict";module.exports.data=function(t,u){u(null,{})};
diff --git a/src/components/base-component-handlebars/_package/template.js b/src/components/base-component-handlebars/_package/template.js
diff --git a/...ts/base-component-handlebars/package.json → ...ts/base-component-handlebars/package.json b/...ts/base-component-handlebars/package.json → ...ts/base-component-handlebars/package.json
diff --git a/...nents/base-component-handlebars/server.js → ...nents/base-component-handlebars/server.js b/...nents/base-component-handlebars/server.js → ...nents/base-component-handlebars/server.js
diff --git a/...s/base-component-handlebars/template.html → ...s/base-component-handlebars/template.html b/...s/base-component-handlebars/template.html → ...s/base-component-handlebars/template.html
diff --git a/components/base-component-jade/.npmignore → ...components/base-component-jade/.npmignore b/components/base-component-jade/.npmignore → ...components/base-component-jade/.npmignore
diff --git a/src/components/base-component-jade/_package/package.json b/src/components/base-component-jade/_package/package.json
@@ -0,0 +1 @@
+{"name":"base-component-jade","description":"","version":"1.0.0","repository":"","oc":{"files":{"template":{"type":"jade","hashKey":"107f7eeca8a523c5d770539f9e51e561a2f217f3","src":"template.js"},"dataProvider":{"type":"node.js","hashKey":"c9286a76c6600084f39b7cb129c97b4bddb1dd03","src":"server.js"},"static":[]},"version":"0.30.2","packaged":true,"date":1461887688472}}
diff --git a/src/components/base-component-jade/_package/server.js b/src/components/base-component-jade/_package/server.js
@@ -0,0 +1 @@
+"use strict";module.exports.data=function(t,u){u(null,{})};
diff --git a/src/components/base-component-jade/_package/template.js b/src/components/base-component-jade/_package/template.js
diff --git a/components/base-component-jade/package.json → ...mponents/base-component-jade/package.json b/components/base-component-jade/package.json → ...mponents/base-component-jade/package.json
diff --git a/components/base-component-jade/server.js → src/components/base-component-jade/server.js b/components/base-component-jade/server.js → src/components/base-component-jade/server.js
diff --git a/components/base-component-jade/template.jade → ...ponents/base-component-jade/template.jade b/components/base-component-jade/template.jade → ...ponents/base-component-jade/template.jade
diff --git a/components/oc-client/.gitignore → src/components/oc-client/.gitignore b/components/oc-client/.gitignore → src/components/oc-client/.gitignore
diff --git a/components/oc-client/.npmignore → src/components/oc-client/.npmignore b/components/oc-client/.npmignore → src/components/oc-client/.npmignore
diff --git a/components/oc-client/LICENSES → src/components/oc-client/LICENSES b/components/oc-client/LICENSES → src/components/oc-client/LICENSES
diff --git a/components/oc-client/_package/package.json → ...omponents/oc-client/_package/package.json b/components/oc-client/_package/package.json → ...omponents/oc-client/_package/package.json
@@ -1 +1 @@
-{"name":"oc-client","description":"The OpenComponents client-side javascript client","version":"0.30.2","repository":"https://github.com/opentable/oc/tree/master/components/oc-client","author":"Matteo Figus <matteofigus@gmail.com>","oc":{"container":false,"renderInfo":false,"minify":false,"parameters":{},"files":{"template":{"type":"handlebars","hashKey":"bb774de6a2b7280c2b66103bd36d7e708a1b7541","src":"template.js"},"static":["src"],"dataProvider":{"type":"node.js","hashKey":"ffb0e43eaf72f55fa13dc1e7262019c14c3dfc81","src":"server.js"}},"version":"0.30.2","packaged":true,"date":1461143035821}}
+{"name":"oc-client","description":"The OpenComponents client-side javascript client","version":"0.30.2","repository":"https://github.com/opentable/oc/tree/master/components/oc-client","author":"Matteo Figus <matteofigus@gmail.com>","oc":{"container":false,"renderInfo":false,"minify":false,"parameters":{},"files":{"template":{"type":"handlebars","hashKey":"bb774de6a2b7280c2b66103bd36d7e708a1b7541","src":"template.js"},"static":["src"],"dataProvider":{"type":"node.js","hashKey":"ffb0e43eaf72f55fa13dc1e7262019c14c3dfc81","src":"server.js"}},"version":"0.30.2","packaged":true,"date":1461887688497}}
diff --git a/components/oc-client/_package/server.js → src/components/oc-client/_package/server.js b/components/oc-client/_package/server.js → src/components/oc-client/_package/server.js
diff --git a/...nents/oc-client/_package/src/head.load.js → ...nents/oc-client/_package/src/head.load.js b/...nents/oc-client/_package/src/head.load.js → ...nents/oc-client/_package/src/head.load.js
diff --git a/...nents/oc-client/_package/src/oc-client.js → ...nents/oc-client/_package/src/oc-client.js b/...nents/oc-client/_package/src/oc-client.js → ...nents/oc-client/_package/src/oc-client.js
diff --git a/...s/oc-client/_package/src/oc-client.min.js → ...s/oc-client/_package/src/oc-client.min.js b/...s/oc-client/_package/src/oc-client.min.js → ...s/oc-client/_package/src/oc-client.min.js
diff --git a/.../oc-client/_package/src/oc-client.min.map → .../oc-client/_package/src/oc-client.min.map b/.../oc-client/_package/src/oc-client.min.map → .../oc-client/_package/src/oc-client.min.map
diff --git a/components/oc-client/_package/template.js → ...components/oc-client/_package/template.js b/components/oc-client/_package/template.js → ...components/oc-client/_package/template.js
diff --git a/components/oc-client/package.json → src/components/oc-client/package.json b/components/oc-client/package.json → src/components/oc-client/package.json
diff --git a/components/oc-client/server.js → src/components/oc-client/server.js b/components/oc-client/server.js → src/components/oc-client/server.js
diff --git a/components/oc-client/src/head.load.js → src/components/oc-client/src/head.load.js b/components/oc-client/src/head.load.js → src/components/oc-client/src/head.load.js
diff --git a/components/oc-client/src/oc-client.js → src/components/oc-client/src/oc-client.js b/components/oc-client/src/oc-client.js → src/components/oc-client/src/oc-client.js
diff --git a/components/oc-client/src/oc-client.min.js → ...components/oc-client/src/oc-client.min.js b/components/oc-client/src/oc-client.min.js → ...components/oc-client/src/oc-client.min.js
diff --git a/components/oc-client/src/oc-client.min.map → ...omponents/oc-client/src/oc-client.min.map b/components/oc-client/src/oc-client.min.map → ...omponents/oc-client/src/oc-client.min.map
diff --git a/components/oc-client/template.html → src/components/oc-client/template.html b/components/oc-client/template.html → src/components/oc-client/template.html
diff --git a/index.js → src/index.js b/index.js → src/index.js
@@ -1,4 +1,4 @@
 'use strict';
 
-module.exports.Client = require('./client');
+module.exports.Client = require('../client');
 module.exports.Registry = require('./registry');
diff --git a/oc-cli.js → src/oc-cli.js b/oc-cli.js → src/oc-cli.js
diff --git a/registry/app-start.js → src/registry/app-start.js b/registry/app-start.js → src/registry/app-start.js
@@ -5,7 +5,7 @@ var format = require('stringformat');
 var path = require('path');
 var _ = require('underscore');
 
-var packageInfo = require('../package.json');
+var packageInfo = require('../../package.json');
 
 module.exports = function(repository, options, callback){
 

diff --git a/registry/domain/authentication.js → src/registry/domain/authentication.js b/registry/domain/authentication.js → src/registry/domain/authentication.js
diff --git a/registry/domain/components-cache.js → src/registry/domain/components-cache.js b/registry/domain/components-cache.js → src/registry/domain/components-cache.js
diff --git a/registry/domain/dependencies-resolver.js → src/registry/domain/dependencies-resolver.js b/registry/domain/dependencies-resolver.js → src/registry/domain/dependencies-resolver.js
diff --git a/registry/domain/events-handler.js → src/registry/domain/events-handler.js b/registry/domain/events-handler.js → src/registry/domain/events-handler.js
diff --git a/registry/domain/options-sanitiser.js → src/registry/domain/options-sanitiser.js b/registry/domain/options-sanitiser.js → src/registry/domain/options-sanitiser.js
diff --git a/registry/domain/plugins-detective.js → src/registry/domain/plugins-detective.js b/registry/domain/plugins-detective.js → src/registry/domain/plugins-detective.js
diff --git a/registry/domain/plugins-initialiser.js → src/registry/domain/plugins-initialiser.js b/registry/domain/plugins-initialiser.js → src/registry/domain/plugins-initialiser.js
diff --git a/registry/domain/repository.js → src/registry/domain/repository.js b/registry/domain/repository.js → src/registry/domain/repository.js
@@ -6,7 +6,7 @@ var path = require('path');
 var _ = require('underscore');
 
 var ComponentsCache = require('./components-cache');
-var packageInfo = require('../../package.json');
+var packageInfo = require('../../../package.json');
 var S3 = require('./s3');
 var settings = require('../../resources/settings');
 var strings = require('../../resources');
@@ -47,7 +47,7 @@ module.exports = function(conf){
     }, 
     getComponentVersions: function(componentName, callback){
       if(componentName === 'oc-client'){
-        return callback(null, [fs.readJsonSync(path.join(__dirname, '../../package.json')).version]);
+        return callback(null, [fs.readJsonSync(path.join(__dirname, '../../../package.json')).version]);
       }
 
       if(!_.contains(local.getComponents(), componentName)){

diff --git a/registry/domain/require-wrapper.js → src/registry/domain/require-wrapper.js b/registry/domain/require-wrapper.js → src/registry/domain/require-wrapper.js
diff --git a/registry/domain/s3.js → src/registry/domain/s3.js b/registry/domain/s3.js → src/registry/domain/s3.js
diff --git a/registry/domain/sanitiser.js → src/registry/domain/sanitiser.js b/registry/domain/sanitiser.js → src/registry/domain/sanitiser.js
diff --git a/registry/domain/url-builder.js → src/registry/domain/url-builder.js b/registry/domain/url-builder.js → src/registry/domain/url-builder.js
diff --git a/...domain/validators/component-parameters.js → ...domain/validators/component-parameters.js b/...domain/validators/component-parameters.js → ...domain/validators/component-parameters.js
diff --git a/registry/domain/validators/index.js → src/registry/domain/validators/index.js b/registry/domain/validators/index.js → src/registry/domain/validators/index.js
diff --git a/registry/domain/validators/node-version.js → ...egistry/domain/validators/node-version.js b/registry/domain/validators/node-version.js → ...egistry/domain/validators/node-version.js
@@ -3,7 +3,7 @@
 var format = require('stringformat');
 var semver = require('semver');
 
-var packageInfo = require('../../../package.json');
+var packageInfo = require('../../../../package.json');
 
 module.exports = function(userAgent, nodeVersion) {
   var result = { isValid: false};

diff --git a/registry/domain/validators/oc-cli-version.js → ...istry/domain/validators/oc-cli-version.js b/registry/domain/validators/oc-cli-version.js → ...istry/domain/validators/oc-cli-version.js
@@ -3,7 +3,7 @@
 var format = require('stringformat');
 var semver = require('semver');
 
-var packageInfo = require('../../../package.json');
+var packageInfo = require('../../../../package.json');
 
 module.exports = function(userAgent) {
   var result = { isValid: false};

diff --git a/...domain/validators/plugins-requirements.js → ...domain/validators/plugins-requirements.js b/...domain/validators/plugins-requirements.js → ...domain/validators/plugins-requirements.js
diff --git a/...main/validators/registry-configuration.js → ...main/validators/registry-configuration.js b/...main/validators/registry-configuration.js → ...main/validators/registry-configuration.js
diff --git a/...try/domain/validators/uploaded-package.js → ...try/domain/validators/uploaded-package.js b/...try/domain/validators/uploaded-package.js → ...try/domain/validators/uploaded-package.js
diff --git a/registry/domain/version-handler.js → src/registry/domain/version-handler.js b/registry/domain/version-handler.js → src/registry/domain/version-handler.js
diff --git a/registry/index.js → src/registry/index.js b/registry/index.js → src/registry/index.js
diff --git a/registry/middleware/base-url-handler.js → src/registry/middleware/base-url-handler.js b/registry/middleware/base-url-handler.js → src/registry/middleware/base-url-handler.js
diff --git a/registry/middleware/cors.js → src/registry/middleware/cors.js b/registry/middleware/cors.js → src/registry/middleware/cors.js
diff --git a/registry/middleware/discovery-handler.js → src/registry/middleware/discovery-handler.js b/registry/middleware/discovery-handler.js → src/registry/middleware/discovery-handler.js
diff --git a/registry/middleware/file-uploads.js → src/registry/middleware/file-uploads.js b/registry/middleware/file-uploads.js → src/registry/middleware/file-uploads.js
diff --git a/registry/middleware/request-handler.js → src/registry/middleware/request-handler.js b/registry/middleware/request-handler.js → src/registry/middleware/request-handler.js
diff --git a/registry/router.js → src/registry/router.js b/registry/router.js → src/registry/router.js
diff --git a/registry/routes/component-info.js → src/registry/routes/component-info.js b/registry/routes/component-info.js → src/registry/routes/component-info.js
diff --git a/registry/routes/component-preview.js → src/registry/routes/component-preview.js b/registry/routes/component-preview.js → src/registry/routes/component-preview.js
diff --git a/registry/routes/component.js → src/registry/routes/component.js b/registry/routes/component.js → src/registry/routes/component.js
diff --git a/registry/routes/components.js → src/registry/routes/components.js b/registry/routes/components.js → src/registry/routes/components.js
diff --git a/.../helpers/get-component-retrieving-info.js → .../helpers/get-component-retrieving-info.js b/.../helpers/get-component-retrieving-info.js → .../helpers/get-component-retrieving-info.js
diff --git a/registry/routes/helpers/get-component.js → src/registry/routes/helpers/get-component.js b/registry/routes/helpers/get-component.js → src/registry/routes/helpers/get-component.js
@@ -7,7 +7,7 @@ var format = require('stringformat');
 var vm = require('vm');
 var _ = require('underscore');
 
-var Client = require('../../../client');
+var Client = require('../../../../client');
 var detective = require('../../domain/plugins-detective');
 var eventsHandler = require('../../domain/events-handler');
 var GetComponentRetrievingInfo = require('./get-component-retrieving-info');

diff --git a/registry/routes/list-components.js → src/registry/routes/list-components.js b/registry/routes/list-components.js → src/registry/routes/list-components.js
@@ -4,7 +4,7 @@ var async = require('async');
 var _ = require('underscore');
 
 var dateStringified = require('../../utils/date-stringify');
-var packageInfo = require('../../package.json');
+var packageInfo = require('../../../package.json');
 var urlBuilder = require('../domain/url-builder');
 
 module.exports = function(repository){

diff --git a/registry/routes/publish.js → src/registry/routes/publish.js b/registry/routes/publish.js → src/registry/routes/publish.js
diff --git a/registry/routes/static-redirector.js → src/registry/routes/static-redirector.js b/registry/routes/static-redirector.js → src/registry/routes/static-redirector.js
diff --git a/registry/views/component-info.jade → src/registry/views/component-info.jade b/registry/views/component-info.jade → src/registry/views/component-info.jade
diff --git a/registry/views/component-preview.jade → src/registry/views/component-preview.jade b/registry/views/component-preview.jade → src/registry/views/component-preview.jade
diff --git a/registry/views/layout.jade → src/registry/views/layout.jade b/registry/views/layout.jade → src/registry/views/layout.jade
diff --git a/registry/views/list-components.jade → src/registry/views/list-components.jade b/registry/views/list-components.jade → src/registry/views/list-components.jade
diff --git a/registry/views/static/component-info.js → src/registry/views/static/component-info.js b/registry/views/static/component-info.js → src/registry/views/static/component-info.js
diff --git a/registry/views/static/list-components.js → src/registry/views/static/list-components.js b/registry/views/static/list-components.js → src/registry/views/static/list-components.js
diff --git a/registry/views/static/style.css → src/registry/views/static/style.css b/registry/views/static/style.css → src/registry/views/static/style.css
diff --git a/resources/index.js → src/resources/index.js b/resources/index.js → src/resources/index.js
diff --git a/resources/settings.js → src/resources/settings.js b/resources/settings.js → src/resources/settings.js
diff --git a/utils/date-stringify.js → src/utils/date-stringify.js b/utils/date-stringify.js → src/utils/date-stringify.js
diff --git a/utils/get-file-info.js → src/utils/get-file-info.js b/utils/get-file-info.js → src/utils/get-file-info.js
diff --git a/utils/get-mime-type.js → src/utils/get-mime-type.js b/utils/get-mime-type.js → src/utils/get-mime-type.js
diff --git a/utils/get-next-year.js → src/utils/get-next-year.js b/utils/get-next-year.js → src/utils/get-next-year.js
diff --git a/utils/get-unix-utc-timestamp.js → src/utils/get-unix-utc-timestamp.js b/utils/get-unix-utc-timestamp.js → src/utils/get-unix-utc-timestamp.js
diff --git a/utils/hash-builder.js → src/utils/hash-builder.js b/utils/hash-builder.js → src/utils/hash-builder.js
diff --git a/utils/pad-zero.js → src/utils/pad-zero.js b/utils/pad-zero.js → src/utils/pad-zero.js
diff --git a/utils/put.js → src/utils/put.js b/utils/put.js → src/utils/put.js
diff --git a/test/acceptance/client.js b/test/acceptance/client.js
@@ -10,7 +10,7 @@ describe('The node.js OC client', function(){
       client,
       clientOfflineRegistry,
       result,
-      oc = require('../../index'),
+      oc = require('../../src/index'),
       $component,
       conf = {          
         local: true,

diff --git a/test/acceptance/registry.js b/test/acceptance/registry.js
@@ -9,7 +9,7 @@ describe('registry', function(){
   var registry,
       result,
       error,
-      oc = require('../../index'),
+      oc = require('../../src/index'),
       conf = {          
         local: true,
         path: path.resolve('test/fixtures/components'),

diff --git a/test/configuration/karma-common.js b/test/configuration/karma-common.js
@@ -15,8 +15,8 @@ module.exports = {
     'test-settings.js',
 
     // The oc-client bundle
-    '../../components/oc-client/src/head.load.js',
-    '../../components/oc-client/src/oc-client.js',
+    '../../src/components/oc-client/src/head.load.js',
+    '../../src/components/oc-client/src/oc-client.js',
 
     // The tests
     '../front-end/*.js'

diff --git a/test/unit/cli-domain-get-components-by-dir.js b/test/unit/cli-domain-get-components-by-dir.js
@@ -32,7 +32,7 @@ var initialise = function(){
     }
   };
 
-  var GetComponentsByDir = injectr('../../cli/domain/get-components-by-dir.js', {
+  var GetComponentsByDir = injectr('../../src/cli/domain/get-components-by-dir.js', {
     'fs-extra': fsMock,
     path: pathMock
   }, { __dirname: '' });

diff --git a/test/unit/cli-domain-get-local-npm-modules.js b/test/unit/cli-domain-get-local-npm-modules.js
@@ -28,7 +28,7 @@ var initialise = function(){
     }
   };
 
-  var GetLocalNpmModules = injectr('../../cli/domain/get-local-npm-modules.js', {
+  var GetLocalNpmModules = injectr('../../src/cli/domain/get-local-npm-modules.js', {
     'fs-extra': fsMock,
     path: pathMock
   }, { __dirname: '' });

diff --git a/test/unit/cli-domain-get-mocked-plugins.js b/test/unit/cli-domain-get-mocked-plugins.js
@@ -20,7 +20,7 @@ var initialise = function(fs){
     writeFile: sinon.stub().yields(null, 'ok')
   }, fs || {});
 
-  getMockedPlugins = injectr('../../cli/domain/get-mocked-plugins.js', {
+  getMockedPlugins = injectr('../../src/cli/domain/get-mocked-plugins.js', {
     'fs-extra': fsMock,
     path: {
       resolve: function(){

diff --git a/test/unit/cli-domain-mock.js b/test/unit/cli-domain-mock.js
@@ -28,7 +28,7 @@ var initialise = function(){
     }
   };
 
-  var Local = injectr('../../cli/domain/mock.js', {
+  var Local = injectr('../../src/cli/domain/mock.js', {
     'fs-extra': fsMock,
     path: pathMock
   }, { __dirname: '' });

diff --git a/test/unit/cli-domain-package-components.js b/test/unit/cli-domain-package-components.js
@@ -28,7 +28,7 @@ var initialise = function(){
     }
   };
 
-  var Local = injectr('../../cli/domain/package-components.js', {
+  var Local = injectr('../../src/cli/domain/package-components.js', {
     'fs-extra': fsMock,
     'uglify-js': {
       minify: function(code){

diff --git a/test/unit/cli-domain-package-server-script.js b/test/unit/cli-domain-package-server-script.js
@@ -19,7 +19,7 @@ var initialise = function(fs){
     writeFile: sinon.stub().yields(null, 'ok')
   }, fs || {});
 
-  packageServerScript = injectr('../../cli/domain/package-server-script.js', {
+  packageServerScript = injectr('../../src/cli/domain/package-server-script.js', {
     'fs-extra': fsMock,
     path: {
       extname: path.extname,

diff --git a/test/unit/cli-domain-package-static-files.js b/test/unit/cli-domain-package-static-files.js
@@ -11,7 +11,7 @@ var packageStaticFiles,
     mocks;
 
 var initialise = function(mocks, params, cb){
-  packageStaticFiles = injectr('../../cli/domain/package-static-files.js', mocks, { console: console });
+  packageStaticFiles = injectr('../../src/cli/domain/package-static-files.js', mocks, { console: console });
   packageStaticFiles(params, function(e, r){
     error = e;
     cb();

diff --git a/test/unit/cli-domain-package-template.js b/test/unit/cli-domain-package-template.js
@@ -20,7 +20,7 @@ var initialise = function(fs, uglifyStub){
     writeFile: sinon.stub().yields(null, 'ok')
   }, fs || {});
 
-  packageTemplate = injectr('../../cli/domain/package-template.js', {
+  packageTemplate = injectr('../../src/cli/domain/package-template.js', {
     'fs-extra': fsMock,
     'uglify-js': {
       minify: uglifyStub || function(code){

diff --git a/test/unit/cli-domain-registry.js b/test/unit/cli-domain-registry.js
@@ -7,7 +7,7 @@ var sinon = require('sinon');
 var getRegistry = function(dependencies, opts){
   dependencies.fs = dependencies.fs || {};
   dependencies.fs.readJsonSync = sinon.stub().returns({ version: '1.2.3' });
-  var Registry = injectr('../../cli/domain/registry.js', {
+  var Registry = injectr('../../src/cli/domain/registry.js', {
         'minimal-request': dependencies.request,
         'fs-extra': dependencies.fs,
         '../../utils/put': dependencies.put,

diff --git a/test/unit/cli-domain-url-parser.js b/test/unit/cli-domain-url-parser.js
@@ -7,7 +7,7 @@ describe('cli : domain : url-parser', function(){
 
   var parsed;
   var execute = function(url, returnVersion){
-    var urlParser = require('../../cli/domain/url-parser');
+    var urlParser = require('../../src/cli/domain/url-parser');
 
     parsed = urlParser.parse({
       href: url,

diff --git a/test/unit/cli-facade-dev.js b/test/unit/cli-facade-dev.js
@@ -7,8 +7,8 @@ var sinon = require('sinon');
 describe('cli : facade : dev', function(){
 
   var logSpy = {},
-      DevFacade = require('../../cli/facade/dev'),
-      Local = require('../../cli/domain/local'),
+      DevFacade = require('../../src/cli/facade/dev'),
+      Local = require('../../src/cli/domain/local'),
       local = new Local({ logger: { log: function(){} } }),
       npm = require('npm'),
       devFacade = new DevFacade({ local: local, logger: logSpy });

diff --git a/test/unit/cli-facade-init.js b/test/unit/cli-facade-init.js
@@ -7,8 +7,8 @@ var sinon = require('sinon');
 describe('cli : facade : init', function(){
 
   var logSpy = {},
-      InitFacade = require('../../cli/facade/init'),
-      Local = require('../../cli/domain/local'),
+      InitFacade = require('../../src/cli/facade/init'),
+      Local = require('../../src/cli/domain/local'),
       local = new Local({ logger: { log: function(){} } }),
       initFacade = new InitFacade({ local: local, logger: logSpy });
 

diff --git a/test/unit/cli-facade-mock.js b/test/unit/cli-facade-mock.js
@@ -7,8 +7,8 @@ var sinon = require('sinon');
 describe('cli : facade : mock', function(){
 
   var logSpy = {},
-      MockFacade = require('../../cli/facade/mock'),
-      Local = require('../../cli/domain/local'),
+      MockFacade = require('../../src/cli/facade/mock'),
+      Local = require('../../src/cli/domain/local'),
       local = new Local({ logger: { log: function(){}}}),
       mockFacade = new MockFacade({ local: local, logger: logSpy });
 

diff --git a/test/unit/cli-facade-preview.js b/test/unit/cli-facade-preview.js
@@ -15,7 +15,7 @@ describe('cli : facade : preview', function(){
     registryStub = { getComponentPreviewUrlByUrl: sinon.stub().yields(error, url)};
     logSpy = { log: sinon.spy()};
 
-    var PreviewFacade = injectr('../../cli/facade/preview.js', { opn: opnSpy }),
+    var PreviewFacade = injectr('../../src/cli/facade/preview.js', { opn: opnSpy }),
         previewFacade = new PreviewFacade({ logger: logSpy, registry: registryStub });
 
     previewFacade({ componentHref: 'http://components.com/component' }, function(){});

diff --git a/test/unit/cli-facade-publish.js b/test/unit/cli-facade-publish.js
@@ -10,12 +10,12 @@ var _ = require('underscore');
 describe('cli : facade : publish', function(){
 
   var logSpy = {},
-      Registry = require('../../cli/domain/registry'),
+      Registry = require('../../src/cli/domain/registry'),
       registry = new Registry(),
-      Local = require('../../cli/domain/local'),
+      Local = require('../../src/cli/domain/local'),
       local = new Local({ logger: { log: function(){} } }),
       readStub = sinon.stub().yields(null, 'test'),
-      PublishFacade = injectr('../../cli/facade/publish.js', { read: readStub }),
+      PublishFacade = injectr('../../src/cli/facade/publish.js', { read: readStub }),
       publishFacade = new PublishFacade({ registry: registry, local: local, logger: logSpy });
 
   var execute = function(cb, creds){

diff --git a/test/unit/cli-facade-registry.js b/test/unit/cli-facade-registry.js
@@ -7,9 +7,9 @@ var sinon = require('sinon');
 describe('cli : facade : registry', function(){
 
   var logSpy = {},
-      Registry = require('../../cli/domain/registry'),
+      Registry = require('../../src/cli/domain/registry'),
       registry = new Registry(),
-      RegistryFacade = require('../../cli/facade/registry'),
+      RegistryFacade = require('../../src/cli/facade/registry'),
       registryFacade = new RegistryFacade({ registry: registry, logger: logSpy });
 
   var execute = function(command){

diff --git a/test/unit/registry-app-start.js b/test/unit/registry-app-start.js
@@ -5,8 +5,8 @@ var injectr = require('injectr');
 var sinon = require('sinon');
 
 var getAppStart = function(mockedRepository, options, callback){
-  var appStart = injectr('../../registry/app-start.js', {
-        '../package.json': { version: '1.2.3' }
+  var appStart = injectr('../../src/registry/app-start.js', {
+        '../../package.json': { version: '1.2.3' }
       }, { console: { log: sinon.stub() }, __dirname: '.'});
 
   return appStart(mockedRepository, options, callback);

diff --git a/test/unit/registry-domain-components-cache.js b/test/unit/registry-domain-components-cache.js
@@ -30,7 +30,7 @@ describe('registry : domain : components-cache', function(){
     clearIntervalStub = sinon.stub();
     setIntervalStub = sinon.stub();
     eventsHandlerStub = { fire: sinon.stub() };
-    var ComponentsCache = injctr('../../registry/domain/components-cache.js', {
+    var ComponentsCache = injctr('../../src/registry/domain/components-cache.js', {
       '../../utils/get-unix-utc-timestamp': function(){
         return 12345678;
       },