diff --git a/_includes/js/conference.js b/_includes/js/conference.js
index 05bb976a..a037d54a 100644
--- a/_includes/js/conference.js
+++ b/_includes/js/conference.js
@@ -2,31 +2,32 @@
 window.conference = {};
 
 // Bootstrap (Style Framework)
-{% include js/jquery-3.5.1.min.js %}
-{% include js/popper.min.js %}
-{% include js/bootstrap.js %}
+{% include js/lib/jquery-3.5.1.min.js %}
+{% include js/lib/popper.min.js %}
+{% include js/lib/bootstrap.js %}
 
 // FontAwesome (Icons)
 //   Imported via CSS and webfonts
 
 // Program
-{% include js/conference-program.js %}
+{% include js/lib/syncscroll.js %}
+{% include js/program.js %}
 
 // Leaflet (Map Display)
 {% include partials/get_enable_map.html %}
 {% if enable_map %}
-    {% include js/leaflet.js %}
-    {% include js/leaflet-easybutton.js %}
-    {% include js/leaflet-locatecontrol.js %}
-    {% include js/leaflet-providers.js %}
+    {% include js/lib/leaflet.js %}
+    {% include js/lib/leaflet-easybutton.js %}
+    {% include js/lib/leaflet-locatecontrol.js %}
+    {% include js/lib/leaflet-providers.js %}
 
-    {% include js/conference-map.js %}
+    {% include js/map.js %}
 {% endif %}
 
 // Modals ("Popups")
-{% include js/conference-modal.js %}
+{% include js/modal.js %}
 
 // Live and Streaming
 {% if site.conference.live %}
-    {% include js/conference-live.js %}
+    {% include js/live.js %}
 {% endif %}
diff --git a/_includes/js/bootstrap.js b/_includes/js/lib/bootstrap.js
similarity index 100%
rename from _includes/js/bootstrap.js
rename to _includes/js/lib/bootstrap.js
diff --git a/_includes/js/jquery-3.5.1.min.js b/_includes/js/lib/jquery-3.5.1.min.js
similarity index 100%
rename from _includes/js/jquery-3.5.1.min.js
rename to _includes/js/lib/jquery-3.5.1.min.js
diff --git a/_includes/js/leaflet-easybutton.js b/_includes/js/lib/leaflet-easybutton.js
similarity index 100%
rename from _includes/js/leaflet-easybutton.js
rename to _includes/js/lib/leaflet-easybutton.js
diff --git a/_includes/js/leaflet-locatecontrol.js b/_includes/js/lib/leaflet-locatecontrol.js
similarity index 100%
rename from _includes/js/leaflet-locatecontrol.js
rename to _includes/js/lib/leaflet-locatecontrol.js
diff --git a/_includes/js/leaflet-providers.js b/_includes/js/lib/leaflet-providers.js
similarity index 100%
rename from _includes/js/leaflet-providers.js
rename to _includes/js/lib/leaflet-providers.js
diff --git a/_includes/js/leaflet.js b/_includes/js/lib/leaflet.js
similarity index 100%
rename from _includes/js/leaflet.js
rename to _includes/js/lib/leaflet.js
diff --git a/_includes/js/popper.min.js b/_includes/js/lib/popper.min.js
similarity index 100%
rename from _includes/js/popper.min.js
rename to _includes/js/lib/popper.min.js
diff --git a/_includes/js/syncscroll.js b/_includes/js/lib/syncscroll.js
similarity index 100%
rename from _includes/js/syncscroll.js
rename to _includes/js/lib/syncscroll.js
diff --git a/_includes/js/conference-live.js b/_includes/js/live.js
similarity index 100%
rename from _includes/js/conference-live.js
rename to _includes/js/live.js
diff --git a/_includes/js/conference-map.js b/_includes/js/map.js
similarity index 100%
rename from _includes/js/conference-map.js
rename to _includes/js/map.js
diff --git a/_includes/js/conference-modal.js b/_includes/js/modal.js
similarity index 100%
rename from _includes/js/conference-modal.js
rename to _includes/js/modal.js
diff --git a/_includes/js/conference-program.js b/_includes/js/program.js
similarity index 96%
rename from _includes/js/conference-program.js
rename to _includes/js/program.js
index 71243b0b..a65aa14d 100644
--- a/_includes/js/conference-program.js
+++ b/_includes/js/program.js
@@ -1,6 +1,3 @@
-// Vertical Scroll Sync
-{% include js/syncscroll.js %}
-
 window.conference.program = (function() {
     let updateHash = function (hash) {
         let scrollPosition = $('body').scrollTop() || $('html').scrollTop();