diff --git a/app/src/app/_abstract/navigation.ts b/app/src/app/_abstract/navigation.ts
index 26200a89..0a180db4 100644
--- a/app/src/app/_abstract/navigation.ts
+++ b/app/src/app/_abstract/navigation.ts
@@ -1,4 +1,4 @@
-module app.abstract.navigation {
+namespace app.abstract.navigation {
 
     export const namespace = 'app.abstract.navigation';
 
diff --git a/app/src/app/admin/admin.ts b/app/src/app/admin/admin.ts
index 26f2cfd3..2d2ed67f 100644
--- a/app/src/app/admin/admin.ts
+++ b/app/src/app/admin/admin.ts
@@ -1,7 +1,7 @@
 
 ///<reference path="../../../src/global.d.ts" />
 
-module app.admin {
+namespace app.admin {
 
     export const namespace = 'app.admin';
 
diff --git a/app/src/app/admin/articles/article/article.ts b/app/src/app/admin/articles/article/article.ts
index 57c28abc..ad8859d2 100644
--- a/app/src/app/admin/articles/article/article.ts
+++ b/app/src/app/admin/articles/article/article.ts
@@ -1,4 +1,4 @@
-module app.admin.articles.article {
+namespace app.admin.articles.article {
 
     export const namespace = 'app.admin.articles.article';
 
diff --git a/app/src/app/admin/articles/articles.ts b/app/src/app/admin/articles/articles.ts
index 5094015e..4ca5ed66 100644
--- a/app/src/app/admin/articles/articles.ts
+++ b/app/src/app/admin/articles/articles.ts
@@ -1,4 +1,4 @@
-module app.admin.articles {
+namespace app.admin.articles {
 
     export const namespace = 'app.admin.articles';
 
diff --git a/app/src/app/admin/articles/curation/curation.ts b/app/src/app/admin/articles/curation/curation.ts
index 5d9577a6..d9f0d950 100644
--- a/app/src/app/admin/articles/curation/curation.ts
+++ b/app/src/app/admin/articles/curation/curation.ts
@@ -1,4 +1,4 @@
-module app.admin.articles.curation {
+namespace app.admin.articles.curation {
 
     export const namespace = 'app.admin.articles.curation';
 
diff --git a/app/src/app/admin/articles/listing/listing.ts b/app/src/app/admin/articles/listing/listing.ts
index 95c21c2c..bd9b3bf5 100644
--- a/app/src/app/admin/articles/listing/listing.ts
+++ b/app/src/app/admin/articles/listing/listing.ts
@@ -1,4 +1,4 @@
-module app.admin.articles.listing {
+namespace app.admin.articles.listing {
 
     export const namespace = 'app.admin.articles.listing';
 
diff --git a/app/src/app/admin/dashboard/dashboard.ts b/app/src/app/admin/dashboard/dashboard.ts
index 07de688c..080a2d51 100644
--- a/app/src/app/admin/dashboard/dashboard.ts
+++ b/app/src/app/admin/dashboard/dashboard.ts
@@ -1,4 +1,4 @@
-module app.admin.dashboard {
+namespace app.admin.dashboard {
 
     export const namespace = 'app.admin.dashboard';
 
diff --git a/app/src/app/admin/media/media.ts b/app/src/app/admin/media/media.ts
index 3fb61380..db8dd22d 100644
--- a/app/src/app/admin/media/media.ts
+++ b/app/src/app/admin/media/media.ts
@@ -1,4 +1,4 @@
-module app.admin.media {
+namespace app.admin.media {
 
     export const namespace = 'app.admin.media';
 
diff --git a/app/src/app/admin/navigation/navigation.ts b/app/src/app/admin/navigation/navigation.ts
index d2af07a7..5c7ed06c 100644
--- a/app/src/app/admin/navigation/navigation.ts
+++ b/app/src/app/admin/navigation/navigation.ts
@@ -1,4 +1,4 @@
-module app.admin.navigation{
+namespace app.admin.navigation{
 
     export const namespace = 'app.admin.navigation';
 
diff --git a/app/src/app/admin/users/users.ts b/app/src/app/admin/users/users.ts
index f360bced..db25ada1 100644
--- a/app/src/app/admin/users/users.ts
+++ b/app/src/app/admin/users/users.ts
@@ -1,4 +1,4 @@
-module app.admin.users {
+namespace app.admin.users {
 
     export const namespace = 'app.admin.users';
 
diff --git a/app/src/app/app.ts b/app/src/app/app.ts
index e7cf40e2..612e392a 100644
--- a/app/src/app/app.ts
+++ b/app/src/app/app.ts
@@ -1,4 +1,4 @@
-module app {
+namespace app {
 
     export const namespace = 'app';
 
diff --git a/app/src/app/guest/articles/articles.ts b/app/src/app/guest/articles/articles.ts
index 5dca2608..ca9d4c5a 100644
--- a/app/src/app/guest/articles/articles.ts
+++ b/app/src/app/guest/articles/articles.ts
@@ -1,4 +1,4 @@
-module app.guest.articles {
+namespace app.guest.articles {
 
     export const namespace = 'app.guest.articles';
 
diff --git a/app/src/app/guest/articles/post/post.ts b/app/src/app/guest/articles/post/post.ts
index 825026ea..e245441f 100644
--- a/app/src/app/guest/articles/post/post.ts
+++ b/app/src/app/guest/articles/post/post.ts
@@ -1,4 +1,4 @@
-module app.guest.articles.post {
+namespace app.guest.articles.post {
 
     export const namespace = 'app.guest.articles.post';
 
diff --git a/app/src/app/guest/error/error.ts b/app/src/app/guest/error/error.ts
index a808edae..4f820bac 100644
--- a/app/src/app/guest/error/error.ts
+++ b/app/src/app/guest/error/error.ts
@@ -1,4 +1,4 @@
-module app.guest.error {
+namespace app.guest.error {
 
     export const namespace = 'app.guest.error';
 
diff --git a/app/src/app/guest/guest.ts b/app/src/app/guest/guest.ts
index 2ac09993..834c5a46 100644
--- a/app/src/app/guest/guest.ts
+++ b/app/src/app/guest/guest.ts
@@ -1,7 +1,7 @@
 
 ///<reference path="../../../src/global.d.ts" />
 
-module app.guest {
+namespace app.guest {
 
     export const namespace = 'app.guest';
 
diff --git a/app/src/app/guest/home/home.ts b/app/src/app/guest/home/home.ts
index 52caee93..5ec955e3 100644
--- a/app/src/app/guest/home/home.ts
+++ b/app/src/app/guest/home/home.ts
@@ -1,4 +1,4 @@
-module app.guest.home {
+namespace app.guest.home {
 
     export const namespace = 'app.guest.home';
 
diff --git a/app/src/app/guest/login/login.ts b/app/src/app/guest/login/login.ts
index 6b70b87f..70dd3b94 100644
--- a/app/src/app/guest/login/login.ts
+++ b/app/src/app/guest/login/login.ts
@@ -1,4 +1,4 @@
-module app.guest.login {
+namespace app.guest.login {
 
     export const namespace = 'app.guest.login';
 
diff --git a/app/src/app/guest/login/resetPassword.ts b/app/src/app/guest/login/resetPassword.ts
index 8ec30509..f71df326 100644
--- a/app/src/app/guest/login/resetPassword.ts
+++ b/app/src/app/guest/login/resetPassword.ts
@@ -1,4 +1,4 @@
-module app.guest.resetPassword {
+namespace app.guest.resetPassword {
 
     export const namespace = 'app.guest.resetPassword';
 
diff --git a/app/src/app/guest/navigation/navigation.ts b/app/src/app/guest/navigation/navigation.ts
index a2feda6d..833592ec 100644
--- a/app/src/app/guest/navigation/navigation.ts
+++ b/app/src/app/guest/navigation/navigation.ts
@@ -1,4 +1,4 @@
-module app.guest.navigation {
+namespace app.guest.navigation {
 
     export const namespace = 'app.guest.navigation';
 
diff --git a/app/src/app/guest/registration/registration.ts b/app/src/app/guest/registration/registration.ts
index e895060a..1716907c 100644
--- a/app/src/app/guest/registration/registration.ts
+++ b/app/src/app/guest/registration/registration.ts
@@ -1,4 +1,4 @@
-module app.guest.registration {
+namespace app.guest.registration {
 
     export const namespace = 'app.guest.registration';
 
diff --git a/app/src/app/guest/sandbox/sandbox.ts b/app/src/app/guest/sandbox/sandbox.ts
index cbcfcc20..1cefcdb1 100644
--- a/app/src/app/guest/sandbox/sandbox.ts
+++ b/app/src/app/guest/sandbox/sandbox.ts
@@ -1,6 +1,6 @@
 ///<reference path="../../../../src/global.d.ts" />
 
-module app.guest.sandbox {
+namespace app.guest.sandbox {
 
     export const namespace = 'app.guest.sandbox';
 
diff --git a/app/src/app/user/profile/profile.ts b/app/src/app/user/profile/profile.ts
index e68b1258..93cd0202 100644
--- a/app/src/app/user/profile/profile.ts
+++ b/app/src/app/user/profile/profile.ts
@@ -1,6 +1,6 @@
 ///<reference path="../../../../src/global.d.ts" />
 
-module app.user.profile {
+namespace app.user.profile {
 
     export const namespace = 'app.user.profile';
 
diff --git a/app/src/app/user/user.ts b/app/src/app/user/user.ts
index ff5f7960..1237459a 100644
--- a/app/src/app/user/user.ts
+++ b/app/src/app/user/user.ts
@@ -1,7 +1,7 @@
 
 ///<reference path="../../../src/global.d.ts" />
 
-module app.user {
+namespace app.user {
 
     export const namespace = 'app.user';
 
diff --git a/app/src/common/common.ts b/app/src/common/common.ts
index bc497902..cdc6ccda 100644
--- a/app/src/common/common.ts
+++ b/app/src/common/common.ts
@@ -1,4 +1,4 @@
-module common {
+namespace common {
 
     export declare class Error {
         public name: string;
diff --git a/app/src/common/directives/directives.ts b/app/src/common/directives/directives.ts
index 77c8dc94..ee7a0a37 100644
--- a/app/src/common/directives/directives.ts
+++ b/app/src/common/directives/directives.ts
@@ -1,4 +1,4 @@
-module common.directives {
+namespace common.directives {
 
     export const namespace = 'common.directives';
 
diff --git a/app/src/common/directives/menuToggle/menuToggle.ts b/app/src/common/directives/menuToggle/menuToggle.ts
index 5b2393e3..22c921bd 100644
--- a/app/src/common/directives/menuToggle/menuToggle.ts
+++ b/app/src/common/directives/menuToggle/menuToggle.ts
@@ -1,4 +1,4 @@
-module common.directives.menuToggle {
+namespace common.directives.menuToggle {
 
     export const namespace = 'common.directives.menuToggle';
 
diff --git a/app/src/common/models/article/articleModel.ts b/app/src/common/models/article/articleModel.ts
index fed3625a..e134d98f 100644
--- a/app/src/common/models/article/articleModel.ts
+++ b/app/src/common/models/article/articleModel.ts
@@ -1,4 +1,4 @@
-module common.models {
+namespace common.models {
 
     export class Article implements IModel{
 
diff --git a/app/src/common/models/model.ts b/app/src/common/models/model.ts
index c434b156..74616ebe 100644
--- a/app/src/common/models/model.ts
+++ b/app/src/common/models/model.ts
@@ -1,4 +1,4 @@
-module common.models {
+namespace common.models {
 
     export interface IModel{} //@todo add common methods/properties of a Model
 
diff --git a/app/src/common/models/user/userModel.ts b/app/src/common/models/user/userModel.ts
index 0c7291fa..4d63ee0b 100644
--- a/app/src/common/models/user/userModel.ts
+++ b/app/src/common/models/user/userModel.ts
@@ -1,4 +1,4 @@
-module common.models {
+namespace common.models {
 
     export class User implements global.IUserData, IModel{
 
diff --git a/app/src/common/providers/stateHelperServiceProvider.ts b/app/src/common/providers/stateHelperServiceProvider.ts
index 5336a0ea..86a4a619 100644
--- a/app/src/common/providers/stateHelperServiceProvider.ts
+++ b/app/src/common/providers/stateHelperServiceProvider.ts
@@ -1,4 +1,4 @@
-module common.providers {
+namespace common.providers {
 
     export const namespace = 'common.providers';
 
diff --git a/app/src/common/services/article/articleService.ts b/app/src/common/services/article/articleService.ts
index 2550afd6..39d8eda2 100644
--- a/app/src/common/services/article/articleService.ts
+++ b/app/src/common/services/article/articleService.ts
@@ -1,4 +1,4 @@
-module common.services.article {
+namespace common.services.article {
 
     export const namespace = 'common.services.article';
 
diff --git a/app/src/common/services/auth/authService.ts b/app/src/common/services/auth/authService.ts
index b77cfb9b..8fdd826d 100644
--- a/app/src/common/services/auth/authService.ts
+++ b/app/src/common/services/auth/authService.ts
@@ -1,4 +1,4 @@
-module common.services.auth {
+namespace common.services.auth {
 
     export const namespace = 'common.services.auth';
 
diff --git a/app/src/common/services/countries/countriesService.ts b/app/src/common/services/countries/countriesService.ts
index 959686f1..dc95c0aa 100644
--- a/app/src/common/services/countries/countriesService.ts
+++ b/app/src/common/services/countries/countriesService.ts
@@ -1,4 +1,4 @@
-module common.services.countries {
+namespace common.services.countries {
 
     export const namespace = 'common.services.countries';
 
diff --git a/app/src/common/services/pagination/paginationService.ts b/app/src/common/services/pagination/paginationService.ts
index e21593be..72e133c2 100644
--- a/app/src/common/services/pagination/paginationService.ts
+++ b/app/src/common/services/pagination/paginationService.ts
@@ -1,4 +1,4 @@
-module common.services.pagination {
+namespace common.services.pagination {
 
     export const namespace = 'common.services.pagination';
 
diff --git a/app/src/common/services/services.ts b/app/src/common/services/services.ts
index bf63f8e0..6c0e354d 100644
--- a/app/src/common/services/services.ts
+++ b/app/src/common/services/services.ts
@@ -1,4 +1,4 @@
-module common.services {
+namespace common.services {
 
     export const namespace = 'common.services';
 
diff --git a/app/src/common/services/timezones/timezonesService.ts b/app/src/common/services/timezones/timezonesService.ts
index 1121678c..2b889d60 100644
--- a/app/src/common/services/timezones/timezonesService.ts
+++ b/app/src/common/services/timezones/timezonesService.ts
@@ -1,4 +1,4 @@
-module common.services.timezones {
+namespace common.services.timezones {
 
     export const namespace = 'common.services.timezones';
 
diff --git a/app/src/common/services/user/userService.ts b/app/src/common/services/user/userService.ts
index 76cc13c5..7f582473 100644
--- a/app/src/common/services/user/userService.ts
+++ b/app/src/common/services/user/userService.ts
@@ -1,4 +1,4 @@
-module common.services.user {
+namespace common.services.user {
 
     export const namespace = 'common.services.user';
 
diff --git a/app/src/config/commonModules.ts b/app/src/config/commonModules.ts
index 2188f99e..f3ef2912 100644
--- a/app/src/config/commonModules.ts
+++ b/app/src/config/commonModules.ts
@@ -1,4 +1,4 @@
-module config.commonModules {
+namespace config.commonModules {
 
     export const namespace = 'config.commonModules';
 
diff --git a/app/src/config/siteModules.ts b/app/src/config/siteModules.ts
index 0c5bf8c8..2a8354c5 100644
--- a/app/src/config/siteModules.ts
+++ b/app/src/config/siteModules.ts
@@ -1,4 +1,4 @@
-module config.siteModules {
+namespace config.siteModules {
 
     export const namespace = 'config.siteModules';
 
diff --git a/app/src/config/stateManager.ts b/app/src/config/stateManager.ts
index 0cddcf28..4c18d8c1 100644
--- a/app/src/config/stateManager.ts
+++ b/app/src/config/stateManager.ts
@@ -1,6 +1,6 @@
 ///<reference path="../../typings/tsd.d.ts" />
 
-module config.stateManager {
+namespace config.stateManager {
 
     export const namespace = 'config.stateManager';
 
diff --git a/app/src/config/vendorModules.ts b/app/src/config/vendorModules.ts
index ca6ad42c..9402cb33 100644
--- a/app/src/config/vendorModules.ts
+++ b/app/src/config/vendorModules.ts
@@ -1,4 +1,4 @@
-module config.vendorModules {
+namespace config.vendorModules {
 
     export const namespace = 'config.vendorModules';
 
diff --git a/app/src/global.d.ts b/app/src/global.d.ts
index fc279dfb..960bdfd9 100644
--- a/app/src/global.d.ts
+++ b/app/src/global.d.ts
@@ -2,7 +2,7 @@
 
 ///<reference path="../typings/tsd.d.ts" />
 
-declare module global {
+declare namespace global {
 
     export interface IState extends ng.ui.IState {
         data: {