diff --git a/grunt_tasks/concat.js b/grunt_tasks/concat.js
index bf07fab..9955afc 100644
--- a/grunt_tasks/concat.js
+++ b/grunt_tasks/concat.js
@@ -4,7 +4,7 @@ module.exports = {
 			'www/assets/scripts/src/app/*.js',
 			'www/assets/scripts/src/templates/*.js',
 			'www/assets/scripts/src/widgets/*.js',
-			'www/assets/scripts/src/app.js'
+			'www/assets/scripts/src/App.js'
 		],
 		dest: 'www/assets/scripts/dist/app.js'
 	},
diff --git a/grunt_tasks/watch.js b/grunt_tasks/watch.js
index f1e0ce5..e3f04c3 100644
--- a/grunt_tasks/watch.js
+++ b/grunt_tasks/watch.js
@@ -4,7 +4,7 @@ module.exports = {
 			'www/assets/scripts/src/**/*.js',
 			'!www/assets/scripts/src/vendors/*.js'
 		],
-		tasks: ['browserify:dev', 'eslint', 'notify:javascript']
+		tasks: ['browserify:dev', 'notify:javascript']
 	},
 	javascript_vendors: {
 		files: [
diff --git a/package.json b/package.json
index 2979fea..643f87f 100644
--- a/package.json
+++ b/package.json
@@ -3,28 +3,28 @@
   "version": "1.0.0",
   "author": "Locomotive <info@locomotive.ca>",
   "devDependencies": {
-    "autoprefixer": "6.3.1",
-    "babel-preset-es2015": "6.3.13",
+    "autoprefixer": "6.3.3",
+    "babel-preset-es2015": "6.5.0",
     "babelify": "7.2.0",
     "eslint-tap": "1.1.0",
-    "glob": "6.0.4",
+    "glob": "7.0.0",
     "grunt": "0.4.5",
     "grunt-browser-sync": "2.2.0",
     "grunt-browserify": "4.0.1",
-    "grunt-contrib-concat": "0.5.1",
+    "grunt-contrib-concat": "1.0.0",
     "grunt-contrib-cssmin": "0.14.0",
-    "grunt-contrib-jshint": "0.12.0",
-    "grunt-contrib-uglify": "0.11.0",
+    "grunt-contrib-jshint": "1.0.0",
+    "grunt-contrib-uglify": "0.11.1",
     "grunt-contrib-watch": "0.6.1",
     "grunt-csscomb": "3.1.0",
-    "grunt-eslint": "17.3.1",
+    "grunt-eslint": "18.0.0",
     "grunt-jsonlint": "1.0.7",
     "grunt-notify": "0.4.3",
     "grunt-phplint": "0.0.8",
-    "grunt-postcss": "0.7.1",
+    "grunt-postcss": "0.7.2",
     "grunt-sass": "1.1.0",
     "grunt-svgmin": "3.1.2",
-    "grunt-svgstore": "0.5.0",
+    "grunt-svgstore": "1.0.0",
     "load-grunt-tasks": "3.4.0"
   }
 }
diff --git a/www/assets/scripts/dist/app.js b/www/assets/scripts/dist/app.js
index 8d43df9..1b3c777 100644
--- a/www/assets/scripts/dist/app.js
+++ b/www/assets/scripts/dist/app.js
@@ -1,72 +1,94 @@
 (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 'use strict';
 
-var _modules = require('./modules');
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); /* jshint esnext: true */
+// ==========================================================================
 
-var modules = _interopRequireWildcard(_modules);
+
+var _Modules = require('./Modules');
+
+var modules = _interopRequireWildcard(_Modules);
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } /* jshint esnext: true */
-// ==========================================================================
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
+var App = function () {
+	function App(options) {
+		_classCallCheck(this, App);
 
-var App = function App(options) {
-	_classCallCheck(this, App);
+		this.modules = modules;
+		this.globals;
+		this.currentModules = [];
+	}
 
-	this.elements = {
-		html: document.documentElement,
-		body: document.body
-	};
-
-	this.params = {
-		current_modules: []
-	};
-
-	this.modules = modules;
-
-	// Globals module
+	// Init globals
 	// ==========================================================================
-	var globals = new this.modules['Globals']();
 
-	/**
-  * @todo  [1]  Discuss storing instanciated objects
-  * @todo  [2]  Discuss singleton concept (one off functions/declarations)
-  */
-	// Modules
-	// ==========================================================================
-	var moduleEls = document.querySelectorAll('[data-module]');
-	for (var i = 0, elsLen = moduleEls.length; i < elsLen; i++) {
 
-		var attr = moduleEls[i].getAttribute('data-module');
+	_createClass(App, [{
+		key: 'initGlobals',
+		value: function initGlobals() {
+			this.globals = new this.modules['Globals']();
+		}
 
-		// Splitting modules found in the data-attribute
-		var moduleAttrs = attr.replace(/\s/g, '').split(',');
+		// Init modules
+		// ==========================================================================
 
-		for (var j = 0, modLen = moduleAttrs.length; j < modLen; j++) {
-			var moduleAttr = moduleAttrs[j];
+	}, {
+		key: 'initModules',
+		value: function initModules() {
+			/**
+    * @todo  [1]  Discuss storing instanciated objects
+    * @todo  [2]  Discuss singleton concept (one off functions/declarations)
+    */
+			var moduleEls = document.querySelectorAll('[data-module]');
+			for (var i = 0, elsLen = moduleEls.length; i < elsLen; i++) {
 
-			if (typeof this.modules[moduleAttr] === 'function' && this.params.current_modules.indexOf(moduleAttr) === -1) {
-				// [1,2]
-				var module = new this.modules[moduleAttr]({
-					$el: $(moduleEls[i])
-				});
-				// [2]
-				this.params.current_modules.push(module);
+				var attr = moduleEls[i].getAttribute('data-module');
+
+				// Splitting modules found in the data-attribute
+				var moduleAttrs = attr.replace(/\s/g, '').split(',');
+
+				for (var j = 0, modLen = moduleAttrs.length; j < modLen; j++) {
+					var moduleAttr = moduleAttrs[j];
+
+					if (typeof this.modules[moduleAttr] === 'function' && this.currentModules.indexOf(moduleAttr) === -1) {
+						// [1,2]
+						var module = new this.modules[moduleAttr]({
+							$el: $(moduleEls[i])
+						});
+						// [2]
+						this.currentModules.push(module);
+					}
+				}
 			}
 		}
-	}
-};
+
+		// Init
+		// ==========================================================================
+
+	}, {
+		key: 'init',
+		value: function init() {
+			this.initGlobals();
+			this.initModules();
+		}
+	}]);
+
+	return App;
+}();
 
 ;
 
-// Init
+// Document ready
 // ==========================================================================
 $(function () {
 	window.app = new App();
+	window.app.init();
 });
 
-},{"./modules":2}],2:[function(require,module,exports){
+},{"./Modules":2}],2:[function(require,module,exports){
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -102,30 +124,98 @@ Object.defineProperty(exports, 'Title', {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-},{"./modules/Generic":3,"./modules/Globals":4,"./modules/Title":6}],3:[function(require,module,exports){
+},{"./modules/Generic":4,"./modules/Globals":5,"./modules/Title":8}],3:[function(require,module,exports){
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _Globals = require('./modules/Globals');
+
+Object.defineProperty(exports, 'Globals', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Globals).default;
+  }
+});
+
+var _Generic = require('./modules/Generic');
+
+Object.defineProperty(exports, 'Generic', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Generic).default;
+  }
+});
+
+var _Title = require('./modules/Title');
+
+Object.defineProperty(exports, 'Title', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Title).default;
+  }
+});
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+},{"./modules/Generic":4,"./modules/Globals":5,"./modules/Title":8}],4:[function(require,module,exports){
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
 	value: true
 });
 
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _Module2 = require('./Module');
+
+var _Module3 = _interopRequireDefault(_Module2);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-// ==========================================================================
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } // ==========================================================================
 // Generic module
 // ==========================================================================
 
-var Generic = function Generic(options) {
-	_classCallCheck(this, Generic);
 
-	this.$el = options.$el;
-	console.log('Generic module');
-	console.log(this.$el);
-};
+var Generic = function (_Module) {
+	_inherits(Generic, _Module);
+
+	function Generic(options) {
+		_classCallCheck(this, Generic);
+
+		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Generic).call(this));
+
+		_this.$el = options.$el;
+
+		console.log('Generic module');
+		console.log(_this.$el);
+		return _this;
+	}
+
+	// Destroy
+	// ==========================================================================
+
+
+	_createClass(Generic, [{
+		key: 'destroy',
+		value: function destroy() {
+			this.$el.off();
+		}
+	}]);
+
+	return Generic;
+}(_Module3.default);
 
 exports.default = Generic;
 
-},{}],4:[function(require,module,exports){
+},{"./Module":6}],5:[function(require,module,exports){
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -151,22 +241,8 @@ var Globals = function Globals() {
 
 exports.default = Globals;
 
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _Generic = require('./templates/Generic');
-
-Object.defineProperty(exports, 'GenericTemplate', {
-  enumerable: true,
-  get: function get() {
-    return _Generic.default;
-  }
-});
-
-'use strict';
+},{"./Svg":7}],6:[function(require,module,exports){
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
 	value: true
@@ -175,9 +251,125 @@ Object.defineProperty(exports, "__esModule", {
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 // ==========================================================================
+// Module
+// ==========================================================================
+
+var Module = function Module() {
+	_classCallCheck(this, Module);
+
+	this.$window = $(window);
+	this.$html = $(document.documentElement);
+	this.$body = $(document.body);
+};
+
+exports.default = Module;
+
+},{}],7:[function(require,module,exports){
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+	value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _Module2 = require('./Module');
+
+var _Module3 = _interopRequireDefault(_Module2);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } // ==========================================================================
+// Svg module
 // ==========================================================================
 
 
-};
+var Svg = function (_Module) {
+	_inherits(Svg, _Module);
+
+	function Svg() {
+		_classCallCheck(this, Svg);
+
+		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Svg).call(this));
+
+		svg4everybody();
+		return _this;
+	}
+
+	// Destroy
+	// ==========================================================================
 
 
+	_createClass(Svg, [{
+		key: 'destroy',
+		value: function destroy() {
+			this.$el.off();
+		}
+	}]);
+
+	return Svg;
+}(_Module3.default);
+
+exports.default = Svg;
+
+},{"./Module":6}],8:[function(require,module,exports){
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+	value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _Module2 = require('./Module');
+
+var _Module3 = _interopRequireDefault(_Module2);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } // ==========================================================================
+// Title module
+// ==========================================================================
+
+
+var Title = function (_Module) {
+	_inherits(Title, _Module);
+
+	function Title(options) {
+		_classCallCheck(this, Title);
+
+		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Title).call(this));
+
+		_this.$el = options.$el;
+
+		console.log('Title module');
+		console.log(_this.$el);
+		return _this;
+	}
+
+	// Destroy
+	// ==========================================================================
+
+
+	_createClass(Title, [{
+		key: 'destroy',
+		value: function destroy() {
+			this.$el.off();
+		}
+	}]);
+
+	return Title;
+}(_Module3.default);
+
+exports.default = Title;
+
+},{"./Module":6}]},{},[1,3,4,5,6,7,8])
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["node_modules/browser-pack/_prelude.js","www\\assets\\scripts\\src\\App.js","www\\assets\\scripts\\src\\Modules.js","www\\assets\\scripts\\src\\modules.js","www\\assets\\scripts\\src\\modules\\Generic.js","www\\assets\\scripts\\src\\modules\\Globals.js","www\\assets\\scripts\\src\\modules\\Module.js","www\\assets\\scripts\\src\\modules\\Svg.js","www\\assets\\scripts\\src\\modules\\Title.js"],"names":[],"mappings":"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","file":"generated.js","sourceRoot":"","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","/* jshint esnext: true */\n// ==========================================================================\nimport * as modules from './Modules'\n\nclass App {\n\tconstructor(options) {\n\t\tthis.modules = modules;\n\t\tthis.globals;\n\t\tthis.currentModules = [];\n\t}\n\n\t// Init globals\n\t// ==========================================================================\n\tinitGlobals() {\n\t\tthis.globals = new this.modules['Globals'];\n\t}\n\n\t// Init modules\n\t// ==========================================================================\n\tinitModules() {\n\t\t/**\n\t\t * @todo  [1]  Discuss storing instanciated objects\n\t\t * @todo  [2]  Discuss singleton concept (one off functions/declarations)\n\t\t */\n\t\tconst moduleEls = document.querySelectorAll('[data-module]');\n\t\tfor (let i = 0, elsLen = moduleEls.length; i < elsLen; i++) {\n\n\t\t\tlet attr = moduleEls[i].getAttribute('data-module');\n\n\t\t\t// Splitting modules found in the data-attribute\n\t\t\tlet moduleAttrs = attr.replace(/\\s/g, '').split(',');\n\n\t\t\tfor (let j = 0, modLen = moduleAttrs.length; j < modLen; j++) {\n\t\t\t\tlet moduleAttr = moduleAttrs[j];\n\n\t\t\t\tif (typeof this.modules[moduleAttr] === 'function' && this.currentModules.indexOf(moduleAttr) === -1) {\n\t\t\t\t\t// [1,2]\n\t\t\t\t\tlet module = new this.modules[moduleAttr]({\n\t\t\t\t\t\t$el: $(moduleEls[i])\n\t\t\t\t\t});\n\t\t\t\t\t// [2]\n\t\t\t\t\tthis.currentModules.push(module);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\t// Init\n\t// ==========================================================================\n\tinit() {\n\t\tthis.initGlobals();\n\t\tthis.initModules();\n\t}\n};\n\n// Document ready\n// ==========================================================================\n$(function() {\n\twindow.app = new App();\n\twindow.app.init();\n});\n","export {default as Globals} from './modules/Globals';\r\nexport {default as Generic} from './modules/Generic';\r\nexport {default as Title} from './modules/Title';\r\n","export {default as Globals} from './modules/Globals';\r\nexport {default as Generic} from './modules/Generic';\r\nexport {default as Title} from './modules/Title';\r\n","// ==========================================================================\n// Generic module\n// ==========================================================================\nimport Module from './Module'\n\nclass Generic extends Module {\n\tconstructor(options) {\n\t\tsuper();\n        this.$el = options.$el;\n\n\t\tconsole.log('Generic module');\n\t\tconsole.log(this.$el);\n\t}\n\n\t// Destroy\n\t// ==========================================================================\n\tdestroy() {\n\t\tthis.$el.off();\n\t}\n}\n\nexport default Generic;\n \n","// ==========================================================================\n// Globals module\n// ==========================================================================\nimport Svg from './Svg';\n\nclass Globals {\n\tconstructor() {\n\t\tnew Svg();\n\t}\n}\n\nexport default Globals;\n","// ==========================================================================\n// Module\n// ==========================================================================\n\nclass Module {\n\tconstructor() {\n\t\tthis.$window = $(window);\n\t\tthis.$html = $(document.documentElement);\n\t\tthis.$body = $(document.body);\n\t}\n}\n\nexport default Module;\n","// ==========================================================================\n// Svg module\n// ==========================================================================\nimport Module from './Module'\n\nclass Svg extends Module {\n\tconstructor() {\n\t\tsuper();\n\n\t\tsvg4everybody();\n\t}\n\n\t// Destroy\n\t// ==========================================================================\n\tdestroy() {\n\t\tthis.$el.off();\n\t}\n}\n\nexport default Svg;\n \n","// ==========================================================================\n// Title module\n// ==========================================================================\nimport Module from './Module'\n\nclass Title extends Module {\n\tconstructor(options) {\n\t\tsuper();\n        this.$el = options.$el;\n\n\t\tconsole.log('Title module');\n\t\tconsole.log(this.$el);\n\t}\n\n\t// Destroy\n\t// ==========================================================================\n\tdestroy() {\n\t\tthis.$el.off();\n\t}\n}\n\nexport default Title;\n \n"]}
diff --git a/www/assets/scripts/src/app.js b/www/assets/scripts/src/app.js
index df369ea..fb18820 100644
--- a/www/assets/scripts/src/app.js
+++ b/www/assets/scripts/src/app.js
@@ -3,29 +3,25 @@
 import * as modules from './modules'
 
 class App {
-	constructor (options) {
-
-		this.elements = {
-			html: document.documentElement,
-			body: document.body
-		};
-
-		this.params = {
-			current_modules: []
-		};
-
+	constructor(options) {
 		this.modules = modules;
+		this.globals;
+		this.currentModules = [];
+	}
 
-		// Globals module
-		// ==========================================================================
-		const globals = new this.modules['Globals'];
+	// Init globals
+	// ==========================================================================
+	initGlobals() {
+		this.globals = new this.modules['Globals'];
+	}
 
+	// Init modules
+	// ==========================================================================
+	initModules() {
 		/**
 		 * @todo  [1]  Discuss storing instanciated objects
 		 * @todo  [2]  Discuss singleton concept (one off functions/declarations)
 		 */
-		// Modules
-		// ==========================================================================
 		const moduleEls = document.querySelectorAll('[data-module]');
 		for (let i = 0, elsLen = moduleEls.length; i < elsLen; i++) {
 
@@ -37,22 +33,29 @@ class App {
 			for (let j = 0, modLen = moduleAttrs.length; j < modLen; j++) {
 				let moduleAttr = moduleAttrs[j];
 
-				if (typeof this.modules[moduleAttr] === 'function' && this.params.current_modules.indexOf(moduleAttr) === -1) {
+				if (typeof this.modules[moduleAttr] === 'function' && this.currentModules.indexOf(moduleAttr) === -1) {
 					// [1,2]
 					let module = new this.modules[moduleAttr]({
 						$el: $(moduleEls[i])
 					});
 					// [2]
-					this.params.current_modules.push(module);
+					this.currentModules.push(module);
 				}
 			}
 		}
+	}
 
+	// Init
+	// ==========================================================================
+	init() {
+		this.initGlobals();
+		this.initModules();
 	}
 };
 
-// Init
+// Document ready
 // ==========================================================================
 $(function() {
 	window.app = new App();
+	window.app.init();
 });
diff --git a/www/assets/scripts/src/modules/Generic.js b/www/assets/scripts/src/modules/Generic.js
index 7d529a5..3a8bec4 100644
--- a/www/assets/scripts/src/modules/Generic.js
+++ b/www/assets/scripts/src/modules/Generic.js
@@ -1,13 +1,22 @@
 // ==========================================================================
 // Generic module
 // ==========================================================================
+import Module from './Module'
 
-class Generic {
-	constructor (options) {
+class Generic extends Module {
+	constructor(options) {
+		super();
         this.$el = options.$el;
+
 		console.log('Generic module');
 		console.log(this.$el);
 	}
+
+	// Destroy
+	// ==========================================================================
+	destroy() {
+		this.$el.off();
+	}
 }
 
 export default Generic;
diff --git a/www/assets/scripts/src/modules/Globals.js b/www/assets/scripts/src/modules/Globals.js
index f472d90..1618cc6 100644
--- a/www/assets/scripts/src/modules/Globals.js
+++ b/www/assets/scripts/src/modules/Globals.js
@@ -4,7 +4,7 @@
 import Svg from './Svg';
 
 class Globals {
-	constructor () {
+	constructor() {
 		new Svg();
 	}
 }
diff --git a/www/assets/scripts/src/modules/Module.js b/www/assets/scripts/src/modules/Module.js
new file mode 100644
index 0000000..39b67d7
--- /dev/null
+++ b/www/assets/scripts/src/modules/Module.js
@@ -0,0 +1,13 @@
+// ==========================================================================
+// Module
+// ==========================================================================
+
+class Module {
+	constructor() {
+		this.$window = $(window);
+		this.$html = $(document.documentElement);
+		this.$body = $(document.body);
+	}
+}
+
+export default Module;
diff --git a/www/assets/scripts/src/modules/Svg.js b/www/assets/scripts/src/modules/Svg.js
index e32914f..0b4b8d2 100644
--- a/www/assets/scripts/src/modules/Svg.js
+++ b/www/assets/scripts/src/modules/Svg.js
@@ -1,11 +1,20 @@
 // ==========================================================================
-// Svg
+// Svg module
 // ==========================================================================
+import Module from './Module'
+
+class Svg extends Module {
+	constructor() {
+		super();
 
-class Svg {
-	constructor () {
 		svg4everybody();
 	}
+
+	// Destroy
+	// ==========================================================================
+	destroy() {
+		this.$el.off();
+	}
 }
 
 export default Svg;
diff --git a/www/assets/scripts/src/modules/Title.js b/www/assets/scripts/src/modules/Title.js
index 12e499b..f6f3940 100644
--- a/www/assets/scripts/src/modules/Title.js
+++ b/www/assets/scripts/src/modules/Title.js
@@ -1,13 +1,23 @@
 // ==========================================================================
 // Title module
 // ==========================================================================
+import Module from './Module'
 
-class Title {
-	constructor (options) {
+class Title extends Module {
+	constructor(options) {
+		super();
         this.$el = options.$el;
+
 		console.log('Title module');
 		console.log(this.$el);
 	}
+
+	// Destroy
+	// ==========================================================================
+	destroy() {
+		this.$el.off();
+	}
 }
 
 export default Title;
+ 
diff --git a/www/index.html b/www/index.html
index 8c3d2aa..499bfab 100644
--- a/www/index.html
+++ b/www/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <!--[if lte IE 9]>     <html lang="fr" class="ie9"> <![endif]-->
-<!--[if gt IE 9]><!--> <html lang="fr" data-template="generic"> <!--<![endif]-->
+<!--[if gt IE 9]><!--> <html lang="fr"> <!--<![endif]-->
 	<head>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">