diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 3f1bf5bf..ba5956e4 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,11 +14,13 @@
 //= require codemirror-autorefresh
 //= require codemirror/modes/css
 //= require jquery3
-//= require 'blacklight_range_limit'
-//= require range_limit_distro_facets
-//= require range_limit_slider
 //= require jquery_ujs
 //= require jquery.fontselect
+//= require flot/jquery.flot.js
+//= require flot/jquery.flot.selection.js
+//= require bootstrap-slider
+//= require bootstrap/tooltip
+//= require_tree ./blacklight_range_limit
 //= require dataTables/jquery.dataTables
 //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
 //= require stat_slider
diff --git a/app/assets/javascripts/range_limit_distro_facets.js b/app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js
similarity index 100%
rename from app/assets/javascripts/range_limit_distro_facets.js
rename to app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js
diff --git a/app/assets/javascripts/blacklight_range_limit/range_limit_shared.js b/app/assets/javascripts/blacklight_range_limit/range_limit_shared.js
new file mode 100644
index 00000000..6aa92cfe
--- /dev/null
+++ b/app/assets/javascripts/blacklight_range_limit/range_limit_shared.js
@@ -0,0 +1,24 @@
+
+// takes a string and parses into an integer, but throws away commas first, to avoid truncation when there is a comma
+// use in place of javascript's native parseInt
+!function(global) {
+  'use strict';
+
+  var previousBlacklightRangeLimit = global.BlacklightRangeLimit;
+
+  function BlacklightRangeLimit(options) {
+    this.options = options || {};
+  }
+
+  BlacklightRangeLimit.noConflict = function noConflict() {
+    global.BlacklightRangeLimit = previousBlacklightRangeLimit;
+    return BlacklightRangeLimit;
+  };
+
+  BlacklightRangeLimit.parseNum = function parseNum(str) {
+    str = String(str).replace(/[^0-9]/g, '');
+    return parseInt(str, 10);
+  };
+
+  global.BlacklightRangeLimit = BlacklightRangeLimit;
+}(this);
diff --git a/app/assets/javascripts/range_limit_slider.js b/app/assets/javascripts/blacklight_range_limit/range_limit_slider.js
similarity index 100%
rename from app/assets/javascripts/range_limit_slider.js
rename to app/assets/javascripts/blacklight_range_limit/range_limit_slider.js