redefine app structure

site/client/app/app.js

@@ -7,8 +7,8 @@ Vue.http.headers.common['X-CSRF-TOKEN'] = $('.token').attr('content');
 
 var app = Vue.extend({
   components: {
-    inner: require('./components/inner'),
-    landing: require('./components/landing')
+    inner: require('./modules/inner/components/inner'),
+    landing: require('./modules/landing/components/landing')
   }
 });
 

site/client/app/components/deckBuilder.js

@@ -1,5 +0,0 @@
-module.exports = {
-
-  template: require('../views/deckBuilder.html')
-
-};

site/client/app/modules/deck-builder/components/deck-builder.js

@@ -0,0 +1,5 @@
+module.exports = {
+
+  template: require('../views/deck-builder.html')
+
+};

site/client/app/modules/inner/components/inner.js

@@ -11,12 +11,12 @@ module.exports = {
   },
 
   components: {
-    searchmatch: require('./modals/searchMatch'),
+    searchmatch: require('./search-match'),
     navigation: require('./navigation'),
     chat: require('./chat'),
 
-    lobby: require('./lobby'),
-    deckBuilder: require('./deckBuilder')
+    lobby: require('./../../lobby/components/lobby'),
+    deckBuilder: require('./../../deck-builder/components/deck-builder'),
   }
 
 };

site/client/app/modules/inner/components/navigation.js

@@ -1,5 +1,3 @@
-var router = require('./../routes');
-
 module.exports = {
 
   template: require('../views/navigation.html'),

site/client/app/modules/inner/components/search-match.js

@@ -1,6 +1,6 @@
 module.exports = {
 
-  template: require('../../views/modals/searchMatch.html'),
+  template: require('./../views/search-match.html'),
 
   inherit: true,
 

site/client/app/modules/landing/components/landing.js

@@ -1,8 +1,6 @@
-var router = require('./../routes');
-
 module.exports = {
 
-  template: require('../views/landing.html'),
+  template: require('./../views/landing.html'),
 
   inherit: true,
 
@@ -13,7 +11,7 @@ module.exports = {
   },
 
   components: {
-    login: require('./modals/login')
+    login: require('./login')
   },
 
   ready: function() {

site/client/app/modules/landing/components/login.js

@@ -1,6 +1,6 @@
 module.exports = {
 
-  template: require('../../views/modals/login.html'),
+  template: require('./../views/login.html'),
 
   inherit: true,