diff --git a/Resources/modules/fos-js-router/module.js b/Resources/modules/fos-js-router/module.js
index 36b941e3a..60282bb42 100644
--- a/Resources/modules/fos-js-router/module.js
+++ b/Resources/modules/fos-js-router/module.js
@@ -1,7 +1,9 @@
+import 'angular/angular.min'
+
 angular.module('ui.fos-js-router', [])
     .filter('path', function () {
         return function (route, parameters = {}) {
             console.log(route, parameters)
             return Routing.generate(route, parameters)
         };
-    })
\ No newline at end of file
+    })
diff --git a/Resources/modules/groups/module.js b/Resources/modules/groups/module.js
index f06296507..e64789993 100644
--- a/Resources/modules/groups/module.js
+++ b/Resources/modules/groups/module.js
@@ -1,3 +1,5 @@
+import 'angular/angular.min'
+
 import GroupController from './Controller/GroupController'
 import EditGroupModalController from './Controller/EditGroupModalController'
 import CreateGroupModalController from './Controller/CreateGroupModalController'
@@ -12,4 +14,4 @@ angular.module('GroupsManager', ['ClarolineSearch', 'data-table', 'ui.router', '
     .controller('EditGroupModalController', EditGroupModalController)
     .controller('UserListController', ['$http', 'ClarolineSearchService', '$stateParams', 'GroupAPIService', 'ClarolineAPIService', UserListController])
     .service('GroupAPIService', GroupAPIService)
-    .config(Routing);
\ No newline at end of file
+    .config(Routing);
diff --git a/Resources/modules/groups/routing.js b/Resources/modules/groups/routing.js
index 00553b322..9e7b42271 100644
--- a/Resources/modules/groups/routing.js
+++ b/Resources/modules/groups/routing.js
@@ -1,4 +1,4 @@
-export default function($stateProvider, $urlRouterProvider) {    
+export default function($stateProvider, $urlRouterProvider) {
     const translate = function(key) {
         return window.Translator.trans(key, {}, 'platform');
     }
@@ -39,4 +39,4 @@ export default function($stateProvider, $urlRouterProvider) {
             }
         )
     ;
-}
\ No newline at end of file
+}
diff --git a/Resources/modules/location/module.js b/Resources/modules/location/module.js
index 80fe37680..1bffaff5c 100644
--- a/Resources/modules/location/module.js
+++ b/Resources/modules/location/module.js
@@ -1,9 +1,11 @@
+import 'angular/angular.min'
+
 import bootstrap from 'angular-bootstrap'
 
-import LocationAPIService from './Service/LocationAPIService' 
-import LocationController from './Controller/LocationController' 
+import LocationAPIService from './Service/LocationAPIService'
+import LocationController from './Controller/LocationController'
 import EditLocationModalController from './Controller/EditLocationModalController'
-import CreateLocationModalController from './Controller/CreateLocationModalController' 
+import CreateLocationModalController from './Controller/CreateLocationModalController'
 import ClarolineAPI from '../services/module'
 
 var LocationManager = angular.module('LocationManager', [
diff --git a/Resources/modules/organization/module.js b/Resources/modules/organization/module.js
index 98f6fcae9..e3347ee03 100644
--- a/Resources/modules/organization/module.js
+++ b/Resources/modules/organization/module.js
@@ -1,4 +1,5 @@
 import 'angular/angular.min'
+
 import dataTable from 'angular-data-table/release/dataTable.helpers.min'
 import bootstrap from 'angular-bootstrap'
 import translation from 'angular-ui-translation/angular-translation'
@@ -16,7 +17,7 @@ import OrganizationAPIService from './Service/OrganizationAPIService'
 var OrganizationManager = angular.module('OrganizationManager', [
     'ui.router',
     'ui.tree',
-    'ui.bootstrap.tpls',        
+    'ui.bootstrap.tpls',
     'LocationManager',
     'ui.translation',
     'ClarolineAPI',
@@ -25,4 +26,4 @@ var OrganizationManager = angular.module('OrganizationManager', [
     .controller('EditOrganizationModalController', EditOrganizationModalController)
     .controller('OrganizationController', ['$http', 'OrganizationAPIService', '$uibModal', 'ClarolineAPIService', OrganizationController])
     .service('OrganizationAPIService', OrganizationAPIService)
-    .config(Routing)
\ No newline at end of file
+    .config(Routing)
diff --git a/Resources/modules/organization/routing.js b/Resources/modules/organization/routing.js
index dfd5d80a4..b00daa5be 100644
--- a/Resources/modules/organization/routing.js
+++ b/Resources/modules/organization/routing.js
@@ -13,7 +13,7 @@ export default function($stateProvider, $urlRouterProvider) {
         .state(
             'organizations.list',
             {
-                url: "",
+                url: '',
                 ncyBreadcrumb: {
                     label: translate('organizations')
                 },
@@ -26,26 +26,24 @@ export default function($stateProvider, $urlRouterProvider) {
                 }
             }
         )
-        
+
         .state(
             'organizations.locations',
             {
-                url: "/locations",
+                url: '/locations',
                 ncyBreadcrumb: {
                     label: translate('locations'),
                     parent: 'organizations.list'
                 },
                 views: {
                     'locations': {
-                        template: require('../location/Partial/locations_main.html'),
+                        template: require('./../location/Partial/locations_main.html'),
                         controller: 'LocationController',
                         controllerAs: 'lc'
                     }
                 }
             }
         )
-    ;
-
 
-    $urlRouterProvider.otherwise("/organizations");
-}
\ No newline at end of file
+    $urlRouterProvider.otherwise('/organizations')
+}
diff --git a/Resources/modules/search/Directive/ClarolineSearchDirective.js b/Resources/modules/search/Directive/ClarolineSearchDirective.js
index 84cedc538..691757746 100644
--- a/Resources/modules/search/Directive/ClarolineSearchDirective.js
+++ b/Resources/modules/search/Directive/ClarolineSearchDirective.js
@@ -11,7 +11,7 @@ export default class ClarolineSearchDirective {
         this.bindToController = {
             onSearch: '&',
             fields: '='
-        };   
+        };
     }
 }
 
diff --git a/Resources/modules/search/module.js b/Resources/modules/search/module.js
index 59232af11..739375128 100644
--- a/Resources/modules/search/module.js
+++ b/Resources/modules/search/module.js
@@ -1,3 +1,4 @@
+import 'angular/angular.min'
 import 'angular-ui-select'
 
 import Interceptors from '../interceptorsDefault'
@@ -10,4 +11,4 @@ angular.module('ClarolineSearch', ['ui.select'])
 	.config(Interceptors)
 	.directive('clarolinesearch', () => new ClarolineSearchDirective)
 	.service('SearchOptionsService', () => new SearchOptionsService)
-	.provider('ClarolineSearchService', () => new ClarolineSearchService)
\ No newline at end of file
+	.provider('ClarolineSearchService', () => new ClarolineSearchService)
diff --git a/Resources/modules/services/module.js b/Resources/modules/services/module.js
index 8c0f536bb..9cd6b0347 100644
--- a/Resources/modules/services/module.js
+++ b/Resources/modules/services/module.js
@@ -1,11 +1,13 @@
+import 'angular/angular.min'
 import 'angular-sanitize'
+
 import ConfirmModalController from './Controller/ConfirmModalController'
 import ClarolineAPIService from './Service/ClarolineAPIService'
 import Interceptors from '../interceptorsDefault'
 
-angular.module('ClarolineAPI', ['ui.bootstrap', 'ui.bootstrap.tpls', 'ngSanitize'])
+angular.module('ClarolineAPI', ['ui.bootstrap', 'ui.bootstrap.tpls'])
     .config(Interceptors)
     .controller('ConfirmModalController', ['callback', 'urlObject', 'title', 'content', '$http', '$uibModalInstance', ConfirmModalController])
     .service('ClarolineAPIService', ClarolineAPIService)
 
-//ClarolineAPIService.$inject('$http', '$httpParamSerializer', '$uibModal')
\ No newline at end of file
+//ClarolineAPIService.$inject('$http', '$httpParamSerializer', '$uibModal')
diff --git a/Resources/modules/users/Partial/main.html b/Resources/modules/users/Partial/main.html
index 0f5208d71..251893dc4 100644
--- a/Resources/modules/users/Partial/main.html
+++ b/Resources/modules/users/Partial/main.html
@@ -1,4 +1,4 @@
 <div ncy-breadcrumb></div>
 
 <div ui-view="users"></div>
-<div ui-view="groups"></div>
\ No newline at end of file
+<div ui-view="groups"></div>
diff --git a/Resources/modules/users/Partial/user_content.html b/Resources/modules/users/Partial/user_content.html
index 2f8c21d55..d44bf9152 100644
--- a/Resources/modules/users/Partial/user_content.html
+++ b/Resources/modules/users/Partial/user_content.html
@@ -29,7 +29,7 @@
     <div align="center" class="action-bar">
         <div class="panel-body">
             <clarolinesearch on-search="uc._onSearch" fields="uc.fields"></clarolinesearch>
-        </div>   
+        </div>
     </div>
     <div>
         <dtable options="uc.dataTableOptions" rows="uc.users" class="material" on-page="uc.paging(offset, size)" selected="uc.selected"></dtable>
diff --git a/Resources/modules/users/module.js b/Resources/modules/users/module.js
index 2c6f2d63d..2f0c8b470 100644
--- a/Resources/modules/users/module.js
+++ b/Resources/modules/users/module.js
@@ -1,4 +1,5 @@
 import 'angular/angular.min'
+
 import dataTable from 'angular-data-table/release/dataTable.helpers.min'
 import bootstrap from 'angular-bootstrap'
 import translation from 'angular-ui-translation/angular-translation'
@@ -23,4 +24,4 @@ angular.module('UsersManager', [
     'GroupsManager',
     'ncy-angular-breadcrumb'
 ]) .controller('UserController', ['$http', 'ClarolineSearchService', 'ClarolineAPIService', UserController])
-   .config(Routing)
\ No newline at end of file
+   .config(Routing)
diff --git a/Resources/modules/users/routing.js b/Resources/modules/users/routing.js
index e67405429..46c74e5fa 100644
--- a/Resources/modules/users/routing.js
+++ b/Resources/modules/users/routing.js
@@ -7,8 +7,7 @@ export default function($stateProvider, $urlRouterProvider) {
         .state ('users', {
             abstract: true,
             url: '/users',
-            template: require('./Partial/main.html'),
-
+            template: require('./Partial/main.html')
         })
         .state(
             'users.list',
@@ -37,12 +36,11 @@ export default function($stateProvider, $urlRouterProvider) {
                 },
                 views: {
                     'groups': {
-                        template: require('../groups/Partial/main.html')
+                        template: require('./../groups/Partial/main.html')
                     }
                 }
             }
         )
-    ;
 
-    $urlRouterProvider.otherwise("/users");
-}
\ No newline at end of file
+    $urlRouterProvider.otherwise('/users');
+}
diff --git a/Resources/scripts/lib/webpack.js b/Resources/scripts/lib/webpack.js
index 768496bd0..5d038d032 100644
--- a/Resources/scripts/lib/webpack.js
+++ b/Resources/scripts/lib/webpack.js
@@ -56,11 +56,7 @@ function configure(rootDir, packages, isWatchMode) {
 
   const loaders = [
     makeJsLoader(isProd),
-    makeRawLoader(),
-    {
-      test: /\.html/,
-      loader: 'raw'
-    }
+    makeRawLoader()
   ]
 
   return {
diff --git a/assets.json b/assets.json
index 915ccbef6..b90141268 100644
--- a/assets.json
+++ b/assets.json
@@ -1,7 +1,7 @@
 {
   "webpack": {
     "entry": {
-      "user-management": "modules/groups/module",
+      "user-management": "modules/users/module",
       "organization-management": "modules/organization/module"
     }
   }