diff --git a/client/galaxy/scripts/apps/tool-panel.js b/client/galaxy/scripts/apps/tool-panel.js
index c268da65163..fc4b419dd8d 100644
--- a/client/galaxy/scripts/apps/tool-panel.js
+++ b/client/galaxy/scripts/apps/tool-panel.js
@@ -1,5 +1,5 @@
 var LeftPanel = require( 'layout/panel' ).LeftPanel,
-    Tools = require( 'mvc/tools' ),
+    Tools = require( 'mvc/tools/tools' ),
     Upload = require( 'mvc/upload/upload-view' );
 //TODO: localize
 
diff --git a/client/galaxy/scripts/galaxy.tools.js b/client/galaxy/scripts/galaxy.tools.js
index da57624c31f..ebb7356c2c3 100644
--- a/client/galaxy/scripts/galaxy.tools.js
+++ b/client/galaxy/scripts/galaxy.tools.js
@@ -1,5 +1,8 @@
 // dependencies
-define([ "libs/underscore", "mvc/tools" ], function( _, Tools ) {
+define([
+    "libs/underscore",
+    "mvc/tools/tools"
+], function( _, Tools ) {
 
     var checkUncheckAll = function( name, check ) {
         $("input[name='" + name + "'][type='checkbox']").attr('checked', !!check);
@@ -61,7 +64,7 @@ define([ "libs/underscore", "mvc/tools" ], function( _, Tools ) {
         'select_map_over_collections': {
             'icon_class': 'fa-folder-o',
             'select_by': 'Map tool over compontents of nested collection',
-            'allow_remap': false,            
+            'allow_remap': false,
         }
     };
 
diff --git a/client/galaxy/scripts/mvc/app/app-analysis.js b/client/galaxy/scripts/mvc/app/app-analysis.js
index 2075bbc2d6c..3042d3ad5f0 100644
--- a/client/galaxy/scripts/mvc/app/app-analysis.js
+++ b/client/galaxy/scripts/mvc/app/app-analysis.js
@@ -1,6 +1,6 @@
 define([
     'utils/utils',
-    'mvc/tools',
+    'mvc/tools/tools',
     'mvc/upload/upload-view',
     'mvc/ui/ui-misc',
     'mvc/history/options-menu',
diff --git a/client/galaxy/scripts/mvc/tools.js b/client/galaxy/scripts/mvc/tools/tools.js
similarity index 100%
rename from client/galaxy/scripts/mvc/tools.js
rename to client/galaxy/scripts/mvc/tools/tools.js
diff --git a/client/galaxy/scripts/viz/sweepster.js b/client/galaxy/scripts/viz/sweepster.js
index 161656934a4..a125cd34852 100644
--- a/client/galaxy/scripts/viz/sweepster.js
+++ b/client/galaxy/scripts/viz/sweepster.js
@@ -3,8 +3,17 @@
  * genomic visualization.
  */
 
-define(["libs/underscore", "libs/d3", "viz/trackster/util", "viz/visualization", "viz/trackster/tracks", "mvc/tools", "mvc/data", "utils/config", "mvc/ui/icon-button"],
-       function(_, d3, util, visualization, tracks, tools, data, config, mod_icon_btn) {
+define([
+    "libs/underscore",
+    "libs/d3",
+    "viz/trackster/util",
+    "viz/visualization",
+    "viz/trackster/tracks",
+    "mvc/tools/tools",
+    "mvc/data",
+    "utils/config",
+    "mvc/ui/icon-button"
+], function(_, d3, util, visualization, tracks, tools, data, config, mod_icon_btn) {
 
 /**
  * A collection of tool input settings. Object is useful for keeping a list of settings
diff --git a/client/galaxy/scripts/viz/trackster/tracks.js b/client/galaxy/scripts/viz/trackster/tracks.js
index 6b5e9afee3f..64d85a1ce06 100644
--- a/client/galaxy/scripts/viz/trackster/tracks.js
+++ b/client/galaxy/scripts/viz/trackster/tracks.js
@@ -7,7 +7,7 @@ define([
     "viz/trackster/painters",
     "viz/trackster/filters",
     "mvc/data",
-    "mvc/tools",
+    "mvc/tools/tools",
     "utils/config",
     "ui/editable-text",
 ], function(_, visualization, viz_views, util, slotting, painters, filters_mod, data, tools_mod, config_mod) {
diff --git a/static/maps/mvc/tools.js.map b/static/maps/mvc/tools/tools.js.map
similarity index 100%
rename from static/maps/mvc/tools.js.map
rename to static/maps/mvc/tools/tools.js.map
diff --git a/static/scripts/mvc/tools.js b/static/scripts/mvc/tools/tools.js
similarity index 100%
rename from static/scripts/mvc/tools.js
rename to static/scripts/mvc/tools/tools.js