diff --git a/src/main/javascript/base/Facet.js b/src/main/javascript/base/Facet.js
index b08bb51..85bd809 100644
--- a/src/main/javascript/base/Facet.js
+++ b/src/main/javascript/base/Facet.js
@@ -1,7 +1,6 @@
 'use strict';
 
 /**
- /**
  * @ngdoc function
  * @name cat.FacetTerm
  * @module cat
diff --git a/src/main/javascript/controller/cat-base-detail-controller.js b/src/main/javascript/controller/cat-base-detail-controller.js
index ee76de1..26cd128 100644
--- a/src/main/javascript/controller/cat-base-detail-controller.js
+++ b/src/main/javascript/controller/cat-base-detail-controller.js
@@ -218,4 +218,4 @@ function CatBaseDetailController($scope, $state, $stateParams, $location, $windo
 }
 
 angular.module('cat.controller.base.detail', ['cat.service.breadcrumbs', 'cat.controller.base.tabs'])
-    .controller('CatBaseDetailController', CatBaseDetailController);
\ No newline at end of file
+    .controller('CatBaseDetailController', CatBaseDetailController);
diff --git a/src/main/javascript/controller/cat-base-list-controller.js b/src/main/javascript/controller/cat-base-list-controller.js
index 8e98d34..f686618 100644
--- a/src/main/javascript/controller/cat-base-list-controller.js
+++ b/src/main/javascript/controller/cat-base-list-controller.js
@@ -1,5 +1,6 @@
 'use strict';
 
+angular.module('cat.controller.base.list', ['cat.service.breadcrumbs'])
 
 /**
  * @ngdoc controller
@@ -26,6 +27,8 @@
  * @param {object} catListDataLoadingService catListDataLoadingService
  * @param {object} config holds data like the listData object, the template url, base url, the model constructor, etc.
  */
+    .controller('CatBaseListController', ['$scope', '$state', '$controller', '$log', 'catBreadcrumbsService', 'catListDataLoadingService', 'config', CatBaseListController]);
+
 function CatBaseListController($scope, $state, $controller, $log, catBreadcrumbsService, catListDataLoadingService, config) {
     if (!_.isUndefined(config.listData)) {
         this.titleKey = 'cc.catalysts.cat-breadcrumbs.entry.' + config.listData.endpoint.getEndpointName();
@@ -73,8 +76,3 @@ function CatBaseListController($scope, $state, $controller, $log, catBreadcrumbs
         $log.info('Couldn\'t instantiate controller with name ' + config.controller);
     }
 }
-
-
-angular.module('cat.controller.base.list', ['cat.service.breadcrumbs'])
-    .controller('CatBaseListController',
-    ['$scope', '$state', '$controller', '$log', 'catBreadcrumbsService', 'catListDataLoadingService', 'config', CatBaseListController]);
diff --git a/src/main/javascript/controller/cat-base-tabs-controller.js b/src/main/javascript/controller/cat-base-tabs-controller.js
index f6ba987..8537e4c 100644
--- a/src/main/javascript/controller/cat-base-tabs-controller.js
+++ b/src/main/javascript/controller/cat-base-tabs-controller.js
@@ -1,5 +1,10 @@
 'use strict';
 
+angular.module('cat.controller.base.tabs', [
+    'cat.service.elementVisibility',
+    'cat.url.resolver.service'
+])
+    
 /**
  * @ngdoc controller
  * @name cat.controller.base.tabs:CatBaseTabsController
@@ -16,6 +21,8 @@
  * @param {Object} catElementVisibilityService The visibility service to check wheter or not a tab should be rendered
  * @param {Object} config The config as handled by state resolve
  */
+    .controller('CatBaseTabsController', CatBaseTabsController);
+
 function CatBaseTabsController($scope, $controller, $stateParams, $location, catElementVisibilityService, config, urlResolverService) {
     var endpoint = config.endpoint;
 
@@ -144,9 +151,3 @@ function CatBaseTabsController($scope, $controller, $stateParams, $location, cat
         }
     }];
 }
-
-angular
-    .module('cat.controller.base.tabs', [
-        'cat.service.elementVisibility',
-        'cat.url.resolver.service'
-    ]).controller('CatBaseTabsController', CatBaseTabsController);
\ No newline at end of file
diff --git a/src/main/javascript/filters/cat-replacetext.js b/src/main/javascript/filters/cat-replacetext.js
index 2db3b6e..312cc13 100644
--- a/src/main/javascript/filters/cat-replacetext.js
+++ b/src/main/javascript/filters/cat-replacetext.js
@@ -1,6 +1,5 @@
 'use strict';
 
-
 angular.module('cat.filters.replaceText', [])
 
 /**
@@ -15,18 +14,18 @@ angular.module('cat.filters.replaceText', [])
  * @param {object} options regular expression options
  * @param {string} replacement replacement text
  */
-.filter('replaceText', function CatReplaceTetFilter() {
-    return function (text, pattern, options, replacement) {
-        if (pattern === undefined)
-            pattern = '\n';
-        if (options === undefined)
-            options = 'g';
-        if (replacement === undefined)
-            replacement = ', ';
-        if (!text) {
-            return text;
-        } else {
-            return String(text).replace(new RegExp(pattern, options), replacement);
-        }
-    };
-});
+    .filter('replaceText', function CatReplaceTetFilter() {
+        return function (text, pattern, options, replacement) {
+            if (pattern === undefined)
+                pattern = '\n';
+            if (options === undefined)
+                options = 'g';
+            if (replacement === undefined)
+                replacement = ', ';
+            if (!text) {
+                return text;
+            } else {
+                return String(text).replace(new RegExp(pattern, options), replacement);
+            }
+        };
+    });
diff --git a/src/main/javascript/module.js b/src/main/javascript/module.js
index 5cc2c1e..db321ec 100644
--- a/src/main/javascript/module.js
+++ b/src/main/javascript/module.js
@@ -34,7 +34,11 @@ angular.module('cat.directives', [
     'cat.directives.facets',
     'cat.directives.sortable',
     'cat.directives.form',
-    'cat.directives.numbersOnly'
+    'cat.directives.numbersOnly',
+    'cat.directives.icon',
+    'cat.directives.messages',
+    'cat.directives.validation',
+    'cat.directives.breadcrumbs'
 ]);
 
 angular.module('cat', [
diff --git a/src/main/javascript/service/cat-breadcrumbs-service.js b/src/main/javascript/service/cat-breadcrumbs-service.js
index 7364c61..d27bf79 100644
--- a/src/main/javascript/service/cat-breadcrumbs-service.js
+++ b/src/main/javascript/service/cat-breadcrumbs-service.js
@@ -1,5 +1,12 @@
 'use strict';
 
+angular.module('cat.service.breadcrumbs', [])
+
+/**
+ * @ngdoc overview
+ * @name cat.service.breadcrumbs:catBreadcrumbs
+ */
+    .value('catBreadcrumbs', [])
 
 /**
  * @ngdoc service
@@ -13,6 +20,8 @@
  *
  * @constructor
  */
+    .service('catBreadcrumbsService', CatBreadcrumbsService);
+
 function CatBreadcrumbsService(catBreadcrumbs, $state) {
     var that = this;
 
@@ -110,12 +119,3 @@ function CatBreadcrumbsService(catBreadcrumbs, $state) {
         return uiStack;
     };
 }
-
-angular.module('cat.service.breadcrumbs', [])
-
-/**
- * @ngdoc overview
- * @name cat.service.breadcrumbs:catBreadcrumbs
- */
-    .value('catBreadcrumbs', [])
-    .service('catBreadcrumbsService', CatBreadcrumbsService);
\ No newline at end of file
diff --git a/src/main/javascript/service/cat-i18n-locale-service.js b/src/main/javascript/service/cat-i18n-locale-service.js
index 5c8f934..803d887 100644
--- a/src/main/javascript/service/cat-i18n-locale-service.js
+++ b/src/main/javascript/service/cat-i18n-locale-service.js
@@ -1,10 +1,25 @@
 'use strict';
 
+angular.module('cat.service.i18n.locale', [])
+    
+/**
+ * @ngdoc overview
+ * @name cat.service.i18n:CAT_I18N_DEFAULT_LOCALE
+ * @constant
+ *
+ * @description
+ * The default locale used for message translation
+ */
+    .constant('CAT_I18N_DEFAULT_LOCALE', 'de')
+
 /**
  * @ngdoc service
  * @name cat.service.i18n:catI18nLocaleService
  * @module cat.service.i18n
  */
+    .service('catI18nLocaleService', ['$q', '$locale', 'CAT_I18N_DEFAULT_LOCALE', CatI18nLocaleService]);
+
+
 function CatI18nLocaleService($q, $locale, CAT_I18N_DEFAULT_LOCALE) {
     this.getLanguageOfLocale = function (locale) {
         if (_.isUndefined(locale)) {
@@ -26,15 +41,3 @@ function CatI18nLocaleService($q, $locale, CAT_I18N_DEFAULT_LOCALE) {
         return CAT_I18N_DEFAULT_LOCALE;
     };
 }
-
-angular.module('cat.service.i18n.locale', [])
-/**
- * @ngdoc overview
- * @name cat.service.i18n:CAT_I18N_DEFAULT_LOCALE
- * @constant
- *
- * @description
- * The default locale used for message translation
- */
-    .constant('CAT_I18N_DEFAULT_LOCALE', 'de')
-    .service('catI18nLocaleService', ['$q', '$locale', 'CAT_I18N_DEFAULT_LOCALE', CatI18nLocaleService]);
\ No newline at end of file
diff --git a/src/main/javascript/service/cat-i18n-message-source-service.js b/src/main/javascript/service/cat-i18n-message-source-service.js
index c6b2db2..41f08a8 100644
--- a/src/main/javascript/service/cat-i18n-message-source-service.js
+++ b/src/main/javascript/service/cat-i18n-message-source-service.js
@@ -14,6 +14,9 @@
  * @param {string} CAT_I18N_DEFAULT_LOCALE DOCTODO
  * @constructor
  */
+angular.module('cat.service.i18n.message', ['cat.service.i18n.locale'])
+    .service('catI18nMessageSourceService', ['$q', 'catI18nLocaleService', 'CAT_I18N_DEFAULT_LOCALE', CatI18nMessageSourceService]);
+
 function CatI18nMessageSourceService($q, catI18nLocaleService, CAT_I18N_DEFAULT_LOCALE) {
     function _getLocale(locale) {
         return locale || catI18nLocaleService.getDefaultLocale();
@@ -89,6 +92,3 @@ function CatI18nMessageSourceService($q, catI18nLocaleService, CAT_I18N_DEFAULT_
         return $q.when(!_.isUndefined(bundle) && !_.isUndefined(bundle[key]));
     };
 }
-
-angular.module('cat.service.i18n.message', ['cat.service.i18n.locale'])
-    .service('catI18nMessageSourceService', ['$q', 'catI18nLocaleService', 'CAT_I18N_DEFAULT_LOCALE', CatI18nMessageSourceService]);
diff --git a/src/main/javascript/service/cat-select-config-service.js b/src/main/javascript/service/cat-select-config-service.js
index e42d0b8..2c33f9a 100644
--- a/src/main/javascript/service/cat-select-config-service.js
+++ b/src/main/javascript/service/cat-select-config-service.js
@@ -1,6 +1,5 @@
 'use strict';
 
-
 function assignDeep(target, source) {
     return _.assign(target, source, function (targetProperty, sourceProperty) {
         if (_.isObject(targetProperty) && _.isObject(sourceProperty)) {
diff --git a/src/main/javascript/service/cat-view-service.js b/src/main/javascript/service/cat-view-service.js
index d524f5c..29f6365 100644
--- a/src/main/javascript/service/cat-view-service.js
+++ b/src/main/javascript/service/cat-view-service.js
@@ -1,5 +1,11 @@
 'use strict';
 
+angular.module('cat.service.view', [
+        'cat.service.api',
+        'cat.service.route',
+        'cat.service.view.config'
+    ])
+
 /**
  * @ngdoc service
  * @name cat.service.view:catViewService
@@ -13,6 +19,8 @@
  * @param {CatApiServiceProvider} catApiServiceProvider DOCTODO
  * @constructor
  */
+    .provider('catViewService', CatViewServiceProvider);
+
 function CatViewServiceProvider(catRouteServiceProvider, catApiServiceProvider) {
     var viewNames = [];
     var endpointNames = [];
@@ -61,11 +69,4 @@ function CatViewServiceProvider(catRouteServiceProvider, catApiServiceProvider)
             endpoints: endpointNames
         };
     };
-}
-
-angular.module('cat.service.view',
-    [
-        'cat.service.api',
-        'cat.service.route',
-        'cat.service.view.config'
-    ]).provider('catViewService', CatViewServiceProvider);
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/javascript/service/http-interceptor.js b/src/main/javascript/service/http-interceptor.js
index c796af7..19f91eb 100644
--- a/src/main/javascript/service/http-interceptor.js
+++ b/src/main/javascript/service/http-interceptor.js
@@ -6,7 +6,6 @@ angular.module('cat.service.httpIntercept', ['cat.service.message', 'cat.service
  * @ngdoc service
  * @name cat.service.httpIntercept:errorHttpInterceptor
  */
-
     .factory('errorHttpInterceptor', function CatErrorHttpInterceptor($q, $globalMessages, loadingService, catValidationService) {
         return {
             'request': function (config) {
diff --git a/src/main/javascript/service/loading-service.js b/src/main/javascript/service/loading-service.js
index 1a0bd12..9763982 100644
--- a/src/main/javascript/service/loading-service.js
+++ b/src/main/javascript/service/loading-service.js
@@ -1,14 +1,16 @@
 'use strict';
 
-/**
- * @ngdoc service
- * @name cat.service.loading:loadingService
- */
 angular.module('cat.service.loading', ['angularSpinner'])
+
     .constant('CAT_LOADING_SERVICE_DEFAULTS', {
         timeout: 50,
         animationDuration: 200
     })
+    
+/**
+ * @ngdoc service
+ * @name cat.service.loading:loadingService
+ */
     .service('loadingService', [
         '$rootScope',
         '$timeout',
diff --git a/src/main/javascript/service/message-service.js b/src/main/javascript/service/message-service.js
index ffd2fb8..5e48c6a 100644
--- a/src/main/javascript/service/message-service.js
+++ b/src/main/javascript/service/message-service.js
@@ -1,10 +1,12 @@
 'use strict';
 
+angular.module('cat.service.message', [])
+
 /**
  * @ngdoc service
  * @name cat.service.message:$globalMessages
  */
-angular.module('cat.service.message', []).service('$globalMessages', function CatGlobalMessages($rootScope) {
+    .service('$globalMessages', function CatGlobalMessages($rootScope) {
     var messages = {};
 
     var self = this;