diff --git a/core/html_api.php b/core/html_api.php
index 66bae6598a..c9f8c4277f 100644
--- a/core/html_api.php
+++ b/core/html_api.php
@@ -159,7 +159,7 @@ function html_rss_link() {
  * @return void
  */
 function html_javascript_link( $p_filename ) {
-	echo "\t", '<script type="text/javascript" src="', helper_mantis_url( 'javascript/' . $p_filename ), '"></script>' . "\n";
+	echo "\t", '<script type="text/javascript" src="', helper_mantis_url( 'js/' . $p_filename ), '"></script>' . "\n";
 }
 
 /**
diff --git a/javascript/bugFilter.js b/js/bugFilter.js
similarity index 100%
rename from javascript/bugFilter.js
rename to js/bugFilter.js
diff --git a/javascript/common.js b/js/common.js
similarity index 100%
rename from javascript/common.js
rename to js/common.js
diff --git a/javascript/install.js b/js/install.js
similarity index 100%
rename from javascript/install.js
rename to js/install.js
diff --git a/javascript/jquery-1.11.3.min.js b/js/jquery-1.11.3.min.js
similarity index 100%
rename from javascript/jquery-1.11.3.min.js
rename to js/jquery-1.11.3.min.js
diff --git a/javascript/jquery-ui-1.11.4.min.js b/js/jquery-ui-1.11.4.min.js
similarity index 100%
rename from javascript/jquery-ui-1.11.4.min.js
rename to js/jquery-ui-1.11.4.min.js
diff --git a/javascript/jscalendar/calendar-blue.css b/js/jscalendar/calendar-blue.css
similarity index 100%
rename from javascript/jscalendar/calendar-blue.css
rename to js/jscalendar/calendar-blue.css
diff --git a/javascript/jscalendar/calendar-setup.js b/js/jscalendar/calendar-setup.js
similarity index 100%
rename from javascript/jscalendar/calendar-setup.js
rename to js/jscalendar/calendar-setup.js
diff --git a/javascript/jscalendar/calendar.js b/js/jscalendar/calendar.js
similarity index 100%
rename from javascript/jscalendar/calendar.js
rename to js/jscalendar/calendar.js
diff --git a/javascript/jscalendar/lang/calendar-en.js b/js/jscalendar/lang/calendar-en.js
similarity index 100%
rename from javascript/jscalendar/lang/calendar-en.js
rename to js/jscalendar/lang/calendar-en.js
diff --git a/javascript/login.js b/js/login.js
similarity index 100%
rename from javascript/login.js
rename to js/login.js
diff --git a/javascript/manage_custom_field_edit_page.js b/js/manage_custom_field_edit_page.js
similarity index 100%
rename from javascript/manage_custom_field_edit_page.js
rename to js/manage_custom_field_edit_page.js