diff --git a/resources/gulp/components/common.js b/resources/gulp/components/common.js
index 0a1111eea3..14985278db 100644
--- a/resources/gulp/components/common.js
+++ b/resources/gulp/components/common.js
@@ -38,9 +38,9 @@ gulp.task('build-common-js', function(){
         config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-en-GB.js',
         config.paths.vendors + 'jquery.cookie/jquery.cookie.js',
         config.paths.src + 'vendors/jquery-contextmenu/js/jquery.contextmenu_custom.js',
-        config.paths.src + 'common/js/jquery.common.js',
-        config.paths.src + 'common/js/jquery.tooltip.js',
-        config.paths.src + 'common/js/jquery.Dialog.js'
+        config.paths.src + 'common/js/components/common.js',
+        config.paths.src + 'common/js/components/tooltip.js',
+        config.paths.src + 'common/js/components/dialog.js'
     ];
     return utils.buildJsGroup(commonGroup, 'common', 'common/js', debugMode);
 });
diff --git a/resources/www/common/js/jquery.common.js b/resources/www/common/js/components/common.js
similarity index 100%
rename from resources/www/common/js/jquery.common.js
rename to resources/www/common/js/components/common.js
diff --git a/resources/www/common/js/jquery.Dialog.js b/resources/www/common/js/components/dialog.js
similarity index 100%
rename from resources/www/common/js/jquery.Dialog.js
rename to resources/www/common/js/components/dialog.js
diff --git a/resources/www/common/js/jquery.tooltip.js b/resources/www/common/js/components/tooltip.js
similarity index 100%
rename from resources/www/common/js/jquery.tooltip.js
rename to resources/www/common/js/components/tooltip.js