diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index 9dc6de61..3c55b4e2 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -107,9 +107,6 @@ init = ($log, $i18n, $config, $rootscope) ->
 # Default Value for taiga local config module.
 angular.module("taigaLocalConfig", []).value("localconfig", {})
 
-# Default constructor for common module
-angular.module("taigaCommon", [])
-
 modules = [
     # Main Global Modules
     "taigaBase",
diff --git a/app/coffee/modules/common.coffee b/app/coffee/modules/common.coffee
new file mode 100644
index 00000000..dc764e4c
--- /dev/null
+++ b/app/coffee/modules/common.coffee
@@ -0,0 +1,22 @@
+###
+# Copyright (C) 2014 Andrey Antukh <niwi@niwi.be>
+# Copyright (C) 2014 Jesús Espino Garcia <jespinog@gmail.com>
+# Copyright (C) 2014 David Barragán Merino <bameda@dbarragan.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: modules/common.coffee
+###
+
+module = angular.module("taigaCommon", [])
diff --git a/app/coffee/modules/lightboxes.coffee b/app/coffee/modules/lightboxes.coffee
index 4b1c88b6..d9d09561 100644
--- a/app/coffee/modules/lightboxes.coffee
+++ b/app/coffee/modules/lightboxes.coffee
@@ -19,6 +19,9 @@
 # File: modules/lightboxes.coffee
 ###
 
+
+# FIXME: this module should not be as the toplevel module.
+# It should be moved and to be part of taigaCommons module.
 module = angular.module("taigaLightboxes", [])