diff --git a/js/framework.exports/amd.js b/js/framework.exports/amd.js
deleted file mode 100644
index 5431487..0000000
--- a/js/framework.exports/amd.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Framework } from "../framework.core.js";
-
-// Register as a named AMD module, since Framework can be concatenated with other
-// files that may use define, but not via a proper concatenation script that
-// understands anonymous AMD modules. A named AMD is safest and most robust
-// way to register. Lowercase framework is used because AMD module names are
-// derived from file names, and Framework is normally delivered in a lowercase
-// file name. Do this after creating the global so that if an AMD module wants
-// to call noConflict to hide this version of Framework, it will work.
-
-// Note that for maximum portability, libraries that are not Framework should
-// declare themselves as anonymous modules, and avoid setting a global if an
-// AMD loader is present. Framework is a special case. For more information, see
-// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
-
-if ( typeof define === "function" && define.amd ) {
-	define( "framework", [], function() {
-		return Framework;
-	} );
-}
\ No newline at end of file
diff --git a/js/framework.exports/global.js b/js/framework.exports/global.js
deleted file mode 100644
index 858cbc8..0000000
--- a/js/framework.exports/global.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Framework } from "../framework.core.js";
-
-var
-
-	// Map over jQuery in case of overwrite
-	_Framework = window.Framework,
-
-	// Map over the $ in case of overwrite
-	_f = window.f;
-
-Framework.noConflict = function( deep ) {
-	if ( window.f === Framework ) {
-		window.f = _f;
-	}
-
-	if ( deep && window.Framework === Framework ) {
-		window.Framework = _Framework;
-	}
-
-	return Framework;
-};
-
-// Expose jQuery and $ identifiers, even in AMD
-// (trac-7102#comment:10, gh-557)
-// and CommonJS for browser emulators (trac-13566)
-if ( typeof noGlobal === "undefined" ) {
-	window.Framework = window.f = Framework;
-}
\ No newline at end of file
diff --git a/js/framework.js b/js/framework.js
index 998dc73..7706306 100644
--- a/js/framework.js
+++ b/js/framework.js
@@ -3,36 +3,67 @@
 import "./framework.selector.js";
 import "./framework.traversing.js";
 import "./framework.callbacks.js";
-import "./framework.deferred.js";
-import "./framework.deferred/exceptionHook.js";
-import "./framework.core/ready.js";
+import "./framework/deferred.js";
+import "./framework/deferred/exceptionHook.js";
+import "./framework/core/ready.js";
 import "./framework.data.js";
 import "./framework.queue.js";
 import "./framework.queue/delay.js";
 import "./framework.attributes.js";
-import "./framework.event.js";
-import "./framework.event/trigger.js";
-import "./framework.manipulation.js";
-import "./framework.manipulation/_evalUrl.js";
+import "./framework/event.js";
+import "./framework/event/trigger.js";
+import "./framework/manipulation.js";
+import "./framework/manipulation/_evalUrl.js";
 import "./framework.wrap.js";
-import "./framework.css.js";
-import "./framework.css/hiddenVisibleSelectors.js";
-import "./framework.css/showHide.js";
+import "./framework/css.js";
+import "./framework/css/hiddenVisibleSelectors.js";
+import "./framework/css/showHide.js";
 import "./framework.serialize.js";
-import "./framework.ajax.js";
-import "./framework.ajax/xhr.js";
-import "./framework.ajax/script.js";
-import "./framework.ajax/jsonp.js";
-import "./framework.ajax/binary.js";
-import "./framework.ajax/load.js";
-import "./framework.core/parseXML.js";
-import "./framework.core/parseHTML.js";
-import "./framework.effects.js";
-import "./framework.effects/animatedSelector.js";
+import "./framework/ajax.js";
+import "./framework/ajax/xhr.js";
+import "./framework/ajax/script.js";
+import "./framework/ajax/jsonp.js";
+import "./framework/ajax/binary.js";
+import "./framework/ajax/load.js";
+import "./framework/core/parseXML.js";
+import "./framework/core/parseHTML.js";
+import "./framework/effects.js";
+import "./framework/effects/animatedSelector.js";
 import "./framework.offset.js";
 import "./framework.dimensions.js";
-import "./framework.deprecated.js";
-import "./framework.exports/amd.js";
-import "./framework.exports/global.js";
+import './framework/util/box.js'
+import './framework/util/imageLoader.js';
+import './framework/util/keyboard.js';
+import './framework/util/mediaQuery.js';
+import './framework/util/motion.js';
+import './framework/util/nest.js';
+import './framework/util/timer.js';
+import './framework/util/touch.js';
+import './framework/util/triggers.js';
+import './framework/elements/abide.js';
+import './framework/elements/accordion.js';
+import './framework/elements/accordionMenu.js';
+import './framework/elements/drilldown.js';
+import './framework/elements/dropdown.js';
+import './framework/elements/dropdownMenu.js';
+import './framework/elements/equalizer.js';
+import './framework/elements/interchange.js';
+import './framework/elements/magellan.js';
+import './framework/elements/offcanvas.js';
+import './framework/elements/orbit.js';
+import './framework/elements/responsiveMenu.js';
+import './framework/elements/responsiveToggle.js';
+import './framework/elements/reveal.js';
+import './framework/elements/slider.js';
+import './framework/elements/switch.js';
+import './framework/elements/smoothScroll.js';
+import './framework/elements/sticky.js';
+import './framework/elements/tabs.js';
+import './framework/elements/toggler.js';
+import './framework/elements/tooltip.js';
+import './framework/elements/responsiveAccordionTabs.js';
+import "./framework/elements/deprecated.js";
+import "./framework/exports/amd.js";
+import "./framework/exports/global.js";
 
 export { Framework, Framework as f, Framework as $ };
\ No newline at end of file
diff --git a/js/framework/exports/amd.js b/js/framework/exports/amd.js
new file mode 100644
index 0000000..5431487
--- /dev/null
+++ b/js/framework/exports/amd.js
@@ -0,0 +1,20 @@
+import { Framework } from "../framework.core.js";
+
+// Register as a named AMD module, since Framework can be concatenated with other
+// files that may use define, but not via a proper concatenation script that
+// understands anonymous AMD modules. A named AMD is safest and most robust
+// way to register. Lowercase framework is used because AMD module names are
+// derived from file names, and Framework is normally delivered in a lowercase
+// file name. Do this after creating the global so that if an AMD module wants
+// to call noConflict to hide this version of Framework, it will work.
+
+// Note that for maximum portability, libraries that are not Framework should
+// declare themselves as anonymous modules, and avoid setting a global if an
+// AMD loader is present. Framework is a special case. For more information, see
+// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
+
+if ( typeof define === "function" && define.amd ) {
+	define( "framework", [], function() {
+		return Framework;
+	} );
+}
\ No newline at end of file
diff --git a/js/framework/exports/global.js b/js/framework/exports/global.js
new file mode 100644
index 0000000..630d73c
--- /dev/null
+++ b/js/framework/exports/global.js
@@ -0,0 +1,28 @@
+import { Framework } from "../../framework.core.js";
+
+var
+
+	// Map over jQuery in case of overwrite
+	_Framework = window.Framework,
+
+	// Map over the $ in case of overwrite
+	_f = window.f;
+
+Framework.noConflict = function( deep ) {
+	if ( window.f === Framework ) {
+		window.f = _f;
+	}
+
+	if ( deep && window.Framework === Framework ) {
+		window.Framework = _Framework;
+	}
+
+	return Framework;
+};
+
+// Expose jQuery and $ identifiers, even in AMD
+// (trac-7102#comment:10, gh-557)
+// and CommonJS for browser emulators (trac-13566)
+if ( typeof noGlobal === "undefined" ) {
+	window.Framework = window.f = Framework;
+}
\ No newline at end of file