diff --git a/cache.manifest b/cache.manifest
index 85bc31cb..e8e991cf 100644
--- a/cache.manifest
+++ b/cache.manifest
@@ -1 +1 @@
-CACHE MANIFEST
# v5

CACHE:
index.html
css/bootstrap.css
css/jgrowl.css
css/main.css
js/async-runner.js
js/base64.js
js/bootstrap.js
js/gdrive.js
js/jquery.jgrowl.js
js/jquery.js
js/jquery.layout.js
js/jquery-ui.custom.js
js/main.js
js/Markdown.Converter.js
js/Markdown.Editor.js
js/Markdown.Sanitizer.js
js/synchronizer.js
img/ajax-loader.gif
img/dropbox.png
img/gdrive.png
img/glyphicons-halflings.png
img/glyphicons-halflings-white.png
img/stackedit-16.png
img/stackedit-32.ico

NETWORK:
*
\ No newline at end of file
+CACHE MANIFEST
# v5

CACHE:
index.html
css/bootstrap.css
css/jgrowl.css
css/main.css
js/prod/custo.js
js/async-runner.js
js/base64.js
js/bootstrap.js
js/config.js
js/gdrive.js
js/jgrowl.js
js/jquery.js
js/jquery-ui.js
js/layout.js
js/main.js
js/Markdown.Converter.js
js/Markdown.Editor.js
js/Markdown.Sanitizer.js
js/require.js
js/synchronizer.js
img/ajax-loader.gif
img/dropbox.png
img/gdrive.png
img/glyphicons-halflings.png
img/glyphicons-halflings-white.png
img/stackedit-16.png
img/stackedit-32.ico

NETWORK:
*
\ No newline at end of file
diff --git a/css/main.css b/css/main.css
index f2cfdbcf..fa2d6c51 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1,3 +1,6 @@
+@import url("bootstrap.css");
+@import url("jgrowl.css");
+
 body {
 	background-color: #f5f5f5;
 }
diff --git a/img/stackedit-promo.svg b/img/stackedit-promo.svg
new file mode 100644
index 00000000..5373f8a0
--- /dev/null
+++ b/img/stackedit-promo.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="800"
+   height="200"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="stackedit-promo.svg"
+   inkscape:export-filename="C:\Documents and Settings\g550003\Mes documents\Mes images\stackedit-promo.png"
+   inkscape:export-xdpi="103.5"
+   inkscape:export-ydpi="103.5">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="521.42724"
+     inkscape:cy="-97.239171"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1143"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3000"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-852.36217)">
+    <text
+       xml:space="preserve"
+       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Corbel;-inkscape-font-specification:Corbel"
+       x="221.88937"
+       y="1017.7139"
+       id="text2991"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan2993"
+         x="221.88937"
+         y="1017.7139">stack<tspan
+   style="font-size:144px;font-weight:bold;-inkscape-font-specification:Corbel Bold"
+   id="tspan2995">edit</tspan></tspan></text>
+    <g
+       id="g3013"
+       transform="matrix(1.015625,0,0,1.015625,-0.48727889,-13.775147)">
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3001"
+         d="m 41.18585,941.60943 0,69.99997 140,0 0,-69.99997"
+         style="fill:none;stroke:#626265;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3789"
+         d="m 61.185851,986.60941 89.999999,0"
+         style="fill:none;stroke:#6c6c70;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3791"
+         d="m 61.185851,966.60944 79.999999,0"
+         style="fill:none;stroke:#95785b;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3793"
+         d="m 61.185851,946.60937 39.999999,0"
+         style="fill:none;stroke:#bc8e48;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3795"
+         d="m 61.185851,926.6094 99.999999,0"
+         style="fill:none;stroke:#d38b28;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3797"
+         d="m 61.185851,906.60943 69.999999,0"
+         style="fill:none;stroke:#fd8a07;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3799"
+         d="m 61.185851,886.60945 99.999999,0"
+         style="fill:none;stroke:#fe7a15;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
diff --git a/img/stackedit.svg b/img/stackedit.svg
new file mode 100644
index 00000000..2021ab9f
--- /dev/null
+++ b/img/stackedit.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="stackedit-dark.svg"
+   inkscape:export-filename="C:\Documents and Settings\g550003\Mes documents\Mes images\stackedit-128.png"
+   inkscape:export-xdpi="360"
+   inkscape:export-ydpi="360">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.4721116"
+     inkscape:cx="89.111669"
+     inkscape:cy="-23.177627"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1143"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3000"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       style="fill:none;stroke:#626265;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 2,-2 0,14 28,0 0,-14"
+       id="path3001"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;stroke:#6c6c70;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 6,23 18,0"
+       id="path3789"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1020.3622)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#95785b;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 6,19 16,0"
+       id="path3791"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1020.3622)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#bc8e48;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 6,15 8,0"
+       id="path3793"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1020.3622)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#d38b28;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 6,11 20,0"
+       id="path3795"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1020.3622)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#fd8a07;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 6,7 20,7"
+       id="path3797"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1020.3622)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#fe7a15;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 6,3 26,3"
+       id="path3799"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1020.3622)" />
+  </g>
+</svg>
diff --git a/index.html b/index.html
index b1c866f9..629e37c7 100644
--- a/index.html
+++ b/index.html
@@ -6,24 +6,8 @@
 <link rel="shortcut icon" href="img/stackedit-32.ico"
 	type="image/x-icon">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<!-- Bootstrap -->
-<link href="css/bootstrap.css" rel="stylesheet" media="screen">
-<link href="css/jgrowl.css" rel="stylesheet" media="screen">
 <link href="css/main.css" rel="stylesheet" media="screen">
-<script type="text/javascript" src="js/base64.js"></script>
-<script type="text/javascript" src="js/jquery.js"></script>
-<script type="text/javascript" src="js/jquery.jgrowl.js"></script>
-<script type="text/javascript" src="js/jquery-ui.custom.js"></script>
-<script type="text/javascript" src="js/jquery.layout.js"></script>
-<script type="text/javascript" src="js/bootstrap.js"></script>
-<script type="text/javascript" src="js/Markdown.Converter.js"></script>
-<script type="text/javascript" src="js/Markdown.Sanitizer.js"></script>
-<script type="text/javascript" src="js/Markdown.Editor.js"></script>
-<script type="text/javascript" src="js/main.js"></script>
-<script type="text/javascript" src="js/async-runner.js"></script>
-<script type="text/javascript" src="js/gdrive.js"></script>
-<script type="text/javascript" src="js/synchronizer.js"></script>
-<script type="text/javascript" src="js/config.custo.js"></script>
+<script data-main="js/main" src="js/require.js"></script>
 <script>
 	(function(i, s, o, g, r, a, m) {
 		i['GoogleAnalyticsObject'] = r;
@@ -54,7 +38,7 @@
 						<i class="icon-refresh"></i>
 					</button></li>
 				<li class="btn-group"><button class="btn action-create-file"
-						title="Create a local file">
+						title="Create a new local file">
 						<i class="icon-file"></i>
 					</button>
 					<button class="btn" title="Delete the current file locally"
@@ -105,9 +89,9 @@
 			</ul>
 		</div>
 	</div>
-	<textarea id="wmd-input" class="ui-layout-center"></textarea>
-	<div class="ui-layout-east"></div>
-	<div class="ui-layout-south"></div>
+	<textarea id="wmd-input" class="ui-layout-center hide"></textarea>
+	<div class="ui-layout-east hide"></div>
+	<div class="ui-layout-south hide"></div>
 
 	<div id="modal-remove-file-confirm" class="modal hide">
 		<div class="modal-header">
diff --git a/js/async-runner.js b/js/async-runner.js
index 9086995e..dca28026 100644
--- a/js/async-runner.js
+++ b/js/async-runner.js
@@ -1,20 +1,19 @@
-var ASYNC_TASK_DEFAULT_TIMEOUT = 30000;
-
 /**
- *  Used to run any asynchronous tasks sequentially (ajax mainly)
+ *  Used to run asynchronous tasks sequentially (ajax mainly)
  *  An asynchronous task must be created with:
  *  - a required run() function that may call success(), error() or retry()
  *  - an optional onSuccess() function
  *  - an optional onError() function
  *  - an optional timeout field (default is 30000)
  */
-var asyncTaskRunner = (function() {
+define(["core"], function(core) {
+	
 	var asyncTaskRunner = {};
 	
 	var asyncTaskQueue = [];
 	var currentTask = undefined;
 	var currentTaskRunning = false;
-	var currentTaskStartTime = currentTime;
+	var currentTaskStartTime = core.currentTime;
 	
 	// Run the next task in the queue if any and no other is running
 	asyncTaskRunner.runTask = function() {
@@ -23,7 +22,7 @@ var asyncTaskRunner = (function() {
 		if(currentTaskRunning === true) {
 			// If the current task takes too long
 			var timeout = currentTask.timeout || ASYNC_TASK_DEFAULT_TIMEOUT;
-			if(currentTaskStartTime + timeout < currentTime) {
+			if(currentTaskStartTime + timeout < core.currentTime) {
 				currentTask.error();
 			}
 			return;
@@ -37,8 +36,8 @@ var asyncTaskRunner = (function() {
 			
 			// Dequeue an enqueued task 
 			currentTask = asyncTaskQueue.shift();
-			currentTaskStartTime = currentTime;
-			showWorkingIndicator(true);
+			currentTaskStartTime = core.currentTime;
+			core.showWorkingIndicator(true);
 			
 			// Set task attributes and functions
 			currentTask.finished = false;
@@ -48,7 +47,7 @@ var asyncTaskRunner = (function() {
 				currentTask = undefined;
 				currentTaskRunning = false;
 				if(asyncTaskQueue.length === 0) {
-					showWorkingIndicator(false);
+					core.showWorkingIndicator(false);
 				}
 				else {
 					asyncTaskRunner.runTask();
@@ -71,14 +70,14 @@ var asyncTaskRunner = (function() {
 				// Implement an exponential backoff
 				var delay = (Math.pow(2, currentTask.retryCounter++) + Math.random()) * 1000;
 				console.log(delay);
-				currentTaskStartTime = currentTime + delay;
+				currentTaskStartTime = core.currentTime + delay;
 				currentTaskRunning = false;
 				asyncTaskRunner.runTask();
 			};
 		}
 		
 		// Run the task
-		if(currentTaskStartTime <= currentTime) {
+		if(currentTaskStartTime <= core.currentTime) {
 			currentTaskRunning = true;
 			currentTask.run();
 		}
@@ -97,7 +96,7 @@ var asyncTaskRunner = (function() {
 			currentTask = undefined;
 			currentTaskRunning = false;
 			if(asyncTaskQueue.length === 0) {
-				showWorkingIndicator(false);
+				core.showWorkingIndicator(false);
 			}
 			else {
 				asyncTaskRunner.runTask();
@@ -111,5 +110,5 @@ var asyncTaskRunner = (function() {
 	};
 	
 	return asyncTaskRunner;
-})();
+});
 
diff --git a/js/config.js b/js/config.js
new file mode 100644
index 00000000..172d7b14
--- /dev/null
+++ b/js/config.js
@@ -0,0 +1,18 @@
+var GOOGLE_SCOPES = [ 'https://www.googleapis.com/auth/drive.install',
+    'https://www.googleapis.com/auth/drive' ];
+var DEFAULT_FILE_TITLE = "Filename";
+var GDRIVE_DEFAULT_FILE_TITLE = "New Markdown document";
+var CHECK_ONLINE_PERIOD = 60000;
+var AJAX_TIMEOUT = 5000;
+var ASYNC_TASK_DEFAULT_TIMEOUT = 30000;
+var AUTH_POPUP_TIMEOUT = 90000;
+var SYNC_PERIOD = 60000;
+var SYNC_PROVIDER_GDRIVE = "sync.gdrive.";
+
+// Use by Google's client.js
+var delayedFunction = undefined;
+function runDelayedFunction() {
+    if (delayedFunction !== undefined) {
+        delayedFunction();
+    }
+}
diff --git a/js/core.js b/js/core.js
new file mode 100644
index 00000000..764e7442
--- /dev/null
+++ b/js/core.js
@@ -0,0 +1,218 @@
+define(["jquery", "bootstrap", "jgrowl", "layout", "Markdown.Editor"], function($) {
+	
+	var core = {};
+	
+	// Time shared by others modules
+	core.currentTime = new Date().getTime();
+	core.updateCurrentTime = function() {
+		core.currentTime = new Date().getTime();
+	};
+	
+	// Usage: callback = callback || core.doNothing;
+	core.doNothing = function() {};
+
+	// Used by asyncTaskRunner
+	core.showWorkingIndicator = function(show) {
+		if (show === false) {
+			$(".working-indicator").addClass("hide");
+		} else {
+			$(".working-indicator").removeClass("hide");
+		}
+	};
+
+	// Used to show a notification message
+	core.showMessage = function(msg, iconClass, options) {
+		options = options || {};
+		iconClass = iconClass || "icon-info-sign";
+		$.jGrowl("<i class='icon-white " + iconClass + "'></i> " + msg, options);
+	};
+
+	// Used to show an error message
+	core.showError = function(msg) {
+		core.showMessage(msg, "icon-warning-sign");
+	};
+
+	// Offline management
+	core.isOffline = false;
+	var offlineTime = core.currentTime;
+	var offlineListeners = [];
+	
+	core.addOfflineListener = function(listener) {
+		offlineListeners.push(listener);
+	};
+	
+	core.setOffline = function() {
+		offlineTime = core.currentTime;
+		if(core.isOffline === false) {
+			core.isOffline = true;
+			core.showMessage("You are offline.", "icon-exclamation-sign msg-offline", {
+				sticky : true,
+				close : function() {
+					core.showMessage("You are back online!", "icon-signal");
+				}
+			});
+			for(var i=0; i<offlineListeners.length; i++) {
+				offlineListeners[i]();
+			}
+		}
+	};
+
+	core.setOnline = function() {
+		if(offline === true) {
+			$(".msg-offline").parents(".jGrowl-notification").trigger(
+				'jGrowl.beforeClose');
+			core.isOffline = false;
+			for(var i=0; i<offlineListeners.length; i++) {
+				offlineListeners[i]();
+			}
+		}
+	};
+
+	core.checkOnline = function() {
+		// Try to reconnect if we are offline but we have some network
+		if (core.isOffline === true && navigator.onLine === true
+			&& offlineTime + CHECK_ONLINE_PERIOD < core.currentTime) {
+			offlineTime = core.currentTime;
+			// Try to download anything to test the connection
+			$.ajax({ 
+				url : "https://apis.google.com/js/client.js",
+				timeout : AJAX_TIMEOUT, dataType : "script"
+			}).done(function() {
+				core.setOnline();
+			});
+		}
+	};
+	
+	// Setting management
+	var settings = { layoutOrientation : "horizontal" };
+	core.loadSettings = function() {
+		if (localStorage.settings) {
+			$.extend(settings, JSON.parse(localStorage.settings));
+		}
+
+		// Layout orientation
+		$("input:radio[name=radio-layout-orientation][value="
+				+ settings.layoutOrientation + "]").prop("checked", true);
+	};
+
+	core.saveSettings = function() {
+
+		// Layout orientation
+		settings.layoutOrientation = $(
+			"input:radio[name=radio-layout-orientation]:checked").prop("value");
+
+		localStorage.settings = JSON.stringify(settings);
+	};
+
+	// Create the layout
+	core.createLayout = function() {
+		var layout = undefined;
+		var layoutGlobalConfig = {
+			closable : true, 
+			resizable : false,
+			slidable : false, 
+			livePaneResizing : true,
+			enableCursorHotkey : false, 
+			spacing_open : 15, 
+			spacing_closed : 15,
+			togglerLength_open : 90, 
+			togglerLength_closed : 90,
+			center__minWidth : 100, 
+			center__minHeight : 100,
+			stateManagement__enabled : false
+		};
+		$(".ui-layout-center, .ui-layout-east, .ui-layout-south").removeClass("hide");
+		if (settings.layoutOrientation == "horizontal") {
+			$(".ui-layout-south").remove();
+			$(".ui-layout-east").addClass("well").prop("id", "wmd-preview");
+			layout = $('body').layout(
+				$.extend(layoutGlobalConfig, {
+					east__resizable : true,
+					east__size : .5, 
+					east__minSize : 200
+				})
+			);
+		} else if (settings.layoutOrientation == "vertical") {
+			$(".ui-layout-east").remove();
+			$(".ui-layout-south").addClass("well").prop("id", "wmd-preview");
+			layout = $('body').layout(
+				$.extend(layoutGlobalConfig, { 
+					south__resizable : true,
+					south__size : .5, 
+					south__minSize : 200
+				})
+			);
+		}
+		$(".ui-layout-toggler-north").addClass("btn").append(
+			$("<b>").addClass("caret"));
+		$(".ui-layout-toggler-south").addClass("btn").append(
+			$("<b>").addClass("caret"));
+		$(".ui-layout-toggler-east").addClass("btn").append(
+			$("<b>").addClass("caret"));
+		$("#navbar").click(function() {
+			layout.allowOverflow('north');
+		});
+	};
+
+	// Create the PageDown editor
+	core.createEditor = function(onTextChange) {
+		$("#wmd-button-bar").empty();
+		var converter = Markdown.getSanitizingConverter();
+		var firstChange = true;
+		converter.hooks.chain("preConversion", function(text) {
+			if (!firstChange) {
+				onTextChange();
+			}
+			return text;
+		});
+		var editor = new Markdown.Editor(converter);
+		editor.run();
+		firstChange = false;
+
+		$(".wmd-button-row").addClass("btn-group").find("li:not(.wmd-spacer)")
+			.addClass("btn").css("left", 0).find("span").hide();
+		$("#wmd-bold-button").append($("<i>").addClass("icon-bold"));
+		$("#wmd-italic-button").append($("<i>").addClass("icon-italic"));
+		$("#wmd-link-button").append($("<i>").addClass("icon-globe"));
+		$("#wmd-quote-button").append($("<i>").addClass("icon-indent-left"));
+		$("#wmd-code-button").append($("<i>").addClass("icon-code"));
+		$("#wmd-image-button").append($("<i>").addClass("icon-picture"));
+		$("#wmd-olist-button").append($("<i>").addClass("icon-numbered-list"));
+		$("#wmd-ulist-button").append($("<i>").addClass("icon-list"));
+		$("#wmd-heading-button").append($("<i>").addClass("icon-text-height"));
+		$("#wmd-hr-button").append($("<i>").addClass("icon-hr"));
+		$("#wmd-undo-button").append($("<i>").addClass("icon-undo"));
+		$("#wmd-redo-button").append($("<i>").addClass("icon-share-alt"));
+	};
+
+	core.init = function() {
+		
+		// jGrowl configuration
+		$.jGrowl.defaults.life = 5000;
+		$.jGrowl.defaults.closer = false;
+		$.jGrowl.defaults.closeTemplate = '';
+		$.jGrowl.defaults.position = 'bottom-right';
+		
+		// listen to online/offline events
+		$(window).on('offline', core.setOffline);
+		$(window).on('online', core.setOnline);
+		if (navigator.onLine === false) {
+			core.setOffline();
+		}
+		
+		this.loadSettings();
+		this.createLayout();
+
+		$(".action-load-settings").click(function() {
+			core.loadSettings();
+		});
+
+		$(".action-apply-settings").click(function() {
+			core.saveSettings();
+			location.reload();
+		});
+	};
+
+	return core;
+});
+
diff --git a/js/file-manager.js b/js/file-manager.js
new file mode 100644
index 00000000..519d22f6
--- /dev/null
+++ b/js/file-manager.js
@@ -0,0 +1,317 @@
+define(["jquery", "core", "gdrive", "synchronizer", "async-runner", "base64"], function($, core, gdrive, synchronizer, asyncTaskRunner) {
+
+	var fileManager = {};
+
+	var save = false;
+	fileManager.init = function() {
+		gdrive.init();
+		
+		var changeSyncButtonState = function() {
+			if(synchronizer.isRunning() || synchronizer.isQueueEmpty() || core.isOffline) {
+				$(".action-force-sync").addClass("disabled");
+			}
+			else {
+				$(".action-force-sync").removeClass("disabled");
+			}
+		};
+		core.addOfflineListener(changeSyncButtonState);
+		synchronizer.init({
+			onSyncBegin : changeSyncButtonState,
+			onSyncEnd : changeSyncButtonState,
+			onQueueChanged : changeSyncButtonState
+		});
+		$(".action-force-sync").click(function() {
+			if(!$(this).hasClass("disabled")) {
+				synchronizer.forceSync();
+			}
+		});
+		
+		fileManager.selectFile();
+
+		// Do periodic tasks
+		window.setInterval(function() {
+			core.updateCurrentTime();
+			fileManager.saveFile();
+			synchronizer.sync();
+			asyncTaskRunner.runTask();
+			core.checkOnline();
+		}, 1000);
+
+		$(".action-create-file").click(function() {
+			fileManager.saveFile();
+			var fileIndex = fileManager.createFile();
+			fileManager.selectFile(fileIndex);
+			$("#file-title").click();
+		});
+		$(".action-remove-file").click(function() {
+			fileManager.deleteFile();
+			fileManager.selectFile();
+		});
+		$(".action-refresh-manage-sync").click(refreshManageSync);
+		$("#file-title").click(function() {
+			$(this).hide();
+			$("#file-title-input").show().focus();
+		});
+		$("#file-title-input").blur(function() {
+			var title = $.trim($(this).val());
+			if (title) {
+				var fileIndexTitle = localStorage["file.current"] + ".title";
+				if (title != localStorage[fileIndexTitle]) {
+					localStorage[fileIndexTitle] = title;
+					fileManager.updateFileTitles();
+					save = true;
+				}
+			}
+			$(this).hide();
+			$("#file-title").show();
+		});
+		$(".action-download-md").click(
+			function() {
+				var content = $("#wmd-input").val();
+				var uriContent = "data:application/octet-stream;base64,"
+					+ base64.encode(content);
+				window.open(uriContent, 'file');
+			});
+		$(".action-download-html").click(
+			function() {
+				var content = $("#wmd-preview").html();
+				var uriContent = "data:application/octet-stream;base64,"
+					+ base64.encode(content);
+				window.open(uriContent, 'file');
+			});
+		$(".action-upload-gdrive").click(uploadGdrive);
+		$(".action-upload-dropbox").click(function() {
+			core.showMessage("Sorry, Dropbox synchronization is not yet available.");
+		});
+	};
+
+	var fileDescList = [];
+	fileManager.selectFile = function(fileIndex) {
+		// If file system does not exist
+		if (!localStorage["file.counter"] || !localStorage["file.list"]) {
+			localStorage.clear();
+			localStorage["file.counter"] = 0;
+			localStorage["file.list"] = ";";
+		}
+		// If no file create one
+		if (localStorage["file.list"].length === 1) {
+			fileIndex = this.createFile();
+		}
+		
+		fileIndex = fileIndex || localStorage["file.current"];
+		if(fileIndex !== undefined) {
+			localStorage["file.current"] = fileIndex;
+		}
+
+		// Update the file titles
+		this.updateFileTitles();
+		// Update the editor
+		var fileIndex = localStorage["file.current"];
+		$("#wmd-input").val(localStorage[fileIndex + ".content"]);
+		core.createEditor(function() {
+			save = true;
+		});
+	};
+
+	fileManager.createFile = function(title, content, syncIndexes) {
+		content = content || "";
+		syncIndexes = syncIndexes || [];
+		if (!title) {
+			// Create a file title 
+			title = DEFAULT_FILE_TITLE;
+			function exists(title) {
+				for ( var i = 0; i < fileDescList.length; i++) {
+					if(fileDescList[i].title == title) {
+						return true;
+					}
+				}
+			}
+			var indicator = 2;
+			while(exists(title)) {
+				title = DEFAULT_FILE_TITLE + indicator++;
+			}
+		}
+		// Create the fileIndex
+		var fileCounter = parseInt(localStorage["file.counter"]);
+		var fileIndex = "file." + fileCounter;
+		// Create the file in the localStorage
+		localStorage[fileIndex + ".content"] = content;
+		localStorage[fileIndex + ".title"] = title;
+		var sync = ";";
+		for(var i=0; i<syncIndexes.length; i++) {
+			sync += syncIndexes[i] + ";";
+		}
+		localStorage[fileIndex + ".sync"] = sync;
+		localStorage["file.counter"] = fileCounter + 1;
+		localStorage["file.list"] += fileIndex + ";";
+		return fileIndex;
+	};
+
+	fileManager.deleteFile = function() {
+		var fileIndex = localStorage["file.current"];
+
+		// Remove synchronized locations
+		var fileSyncIndexList = localStorage[fileIndex + ".sync"].split(";");
+		for ( var i = 1; i < fileSyncIndexList.length - 1; i++) {
+			var fileSyncIndex = fileSyncIndexList[i];
+			fileManager.removeSync(fileSyncIndex);
+		}
+		localStorage.removeItem(fileIndex + ".sync");
+
+		localStorage.removeItem("file.current");
+		localStorage["file.list"] = localStorage["file.list"].replace(";"
+			+ fileIndex + ";", ";");
+		localStorage.removeItem(fileIndex + ".title");
+		localStorage.removeItem(fileIndex + ".content");
+	};
+
+	fileManager.saveFile = function() {
+		if (save) {
+			var content = $("#wmd-input").val();
+			var fileIndex = localStorage["file.current"];
+			localStorage[fileIndex + ".content"] = content;
+			synchronizer.addFileForUpload(fileIndex);
+			save = false;
+		}
+	};
+	
+	fileManager.updateFileTitles = function() {
+		fileDescList = [];
+		$("#file-selector").empty();
+		var fileIndexList = localStorage["file.list"].split(";");
+		for ( var i = 1; i < fileIndexList.length - 1; i++) {
+			var fileIndex = fileIndexList[i];
+			var title = localStorage[fileIndex + ".title"];
+			fileDescList.push({ index : fileIndex, title : title });
+		}
+		fileDescList.sort(function(a, b) {
+			if (a.title.toLowerCase() < b.title.toLowerCase())
+				return -1;
+			if (a.title.toLowerCase() > b.title.toLowerCase())
+				return 1;
+			return 0;
+		});
+
+		var fileIndex = localStorage["file.current"];
+		// If no default file take first one
+		if (!fileIndex) {
+			fileIndex = fileDescList[0].index;
+			localStorage["file.current"] = fileIndex;
+		}
+		
+		var useGoogleDrive = false;
+		function composeTitle(fileIndex) {
+			var result = localStorage[fileIndex + ".title"];
+			var sync = localStorage[fileIndex + ".sync"];
+			if (sync.indexOf(";" + SYNC_PROVIDER_GDRIVE) !== -1) {
+				useGoogleDrive = true;
+				result = '<i class="icon-gdrive"></i> ' + result;
+			}
+			return result;
+		}
+		synchronizer.useGoogleDrive = useGoogleDrive;
+
+		// Update the file title
+		var title = localStorage[fileIndex + ".title"];
+		document.title = "StackEdit - " + title;
+		$("#file-title").html(composeTitle(fileIndex));
+		$(".file-title").text(title);
+		$("#file-title-input").val(title);
+		
+		// Update the file selector
+		$("#file-selector").empty();
+		for ( var i = 0; i < fileDescList.length; i++) {
+			var fileDesc = fileDescList[i];
+			var a = $("<a>").html(composeTitle(fileDesc.index));
+			var li = $("<li>").append(a);
+			if (fileDesc.index == fileIndex) {
+				li.addClass("disabled");
+			} else {
+				a.prop("href", "#").click((function(fileIndex) {
+					return function() {
+						localStorage["file.current"] = fileIndex;
+						fileManager.selectFile();
+					};
+				})(fileDesc.index));
+			}
+			$("#file-selector").append(li);
+		}
+	};
+
+	// Remove a synchronized location
+	fileManager.removeSync = function(fileSyncIndex) {
+		var fileIndexList = localStorage["file.list"].split(";");
+		// Look for local files associated to this synchronized location 
+		for ( var i = 1; i < fileIndexList.length - 1; i++) {
+			var fileIndexSync = fileIndexList[i] + ".sync";
+			localStorage[fileIndexSync] = localStorage[fileIndexSync].replace(";"
+				+ fileSyncIndex + ";", ";");
+		}
+		// Remove etag
+		localStorage.removeItem(fileSyncIndex + ".etag");
+	};
+	
+	// Look for local file associated to a synchronized location 
+	fileManager.getFileIndexFromSync = function(fileSyncIndex) {
+		var fileIndex = undefined;
+		var fileIndexList = localStorage["file.list"].split(";");
+		for ( var i = 1; i < fileIndexList.length - 1; i++) {
+			var tempFileIndex = fileIndexList[i];
+			var sync = localStorage[tempFileIndex + ".sync"];
+			if (sync.indexOf(";" + fileSyncIndex + ";") !== -1) {
+				fileIndex = tempFileIndex;
+				break;
+			}
+		}
+		return fileIndex;
+	};
+
+	function uploadGdrive() {
+		$(".file-sync-indicator").removeClass("hide");
+		var fileIndex = localStorage["file.current"];
+		var content = localStorage[fileIndex + ".content"];
+		var title = localStorage[fileIndex + ".title"];
+		gdrive.createFile(title, content, function(fileSyncIndex) {
+			if (fileSyncIndex) {
+				localStorage[fileIndex + ".sync"] += fileSyncIndex + ";";
+				fileManager.updateFileTitles();
+				core.showMessage('"' + title
+					+ '" will now be synchronized on Google Drive.');
+			}
+		});
+	}
+
+	function refreshManageSync() {
+		var fileIndex = localStorage["file.current"];
+		var fileSyncIndexList = localStorage[fileIndex + ".sync"].split(";");
+		$(".msg-no-sync, .msg-sync-list").addClass("hide");
+		$("#manage-sync-list .input-append").remove();
+		if (fileSyncIndexList.length > 2) {
+			$(".msg-sync-list").removeClass("hide");
+		} else {
+			$(".msg-no-sync").removeClass("hide");
+		}
+		for ( var i = 1; i < fileSyncIndexList.length - 1; i++) {
+			var fileSyncIndex = fileSyncIndexList[i];
+			(function(fileSyncIndex) {
+				var line = $("<div>").addClass("input-append");
+				if (fileSyncIndex.indexOf(SYNC_PROVIDER_GDRIVE) === 0) {
+					line.append($("<input>").prop("type", "text").prop(
+						"disabled", true).addClass("span5").val(
+						"Google Drive, FileID="
+							+ fileSyncIndex.substring(SYNC_PROVIDER_GDRIVE.length)));
+					line.append($("<a>").addClass("btn").html(
+						'<i class="icon-trash"></i>').prop("title",
+						"Remove this synchronized location").click(function() {
+						fileManager.removeSync(fileSyncIndex);
+						fileManager.updateFileTitles();
+						refreshManageSync();
+					}));
+				}
+				$("#manage-sync-list").append(line);
+			})(fileSyncIndex);
+		}
+	}
+
+	return fileManager;
+});
diff --git a/js/gdrive.js b/js/gdrive.js
index e044187c..f22bc334 100644
--- a/js/gdrive.js
+++ b/js/gdrive.js
@@ -1,52 +1,37 @@
-var GOOGLE_CLIENT_ID = '241271498917-jpto9lls9fqnem1e4h6ppds9uob8rpvu.apps.googleusercontent.com';
-var SCOPES = [ 'https://www.googleapis.com/auth/drive.install',
-	'https://www.googleapis.com/auth/drive.file' ];
-var AUTH_POPUP_TIMEOUT = 90000;
-var DEFAULT_GDRIVE_FILE_TITLE = "New Markdown document";
-
-var gdriveDelayedFunction = undefined;
-function runGdriveDelayedFunction() {
-	if (gdriveDelayedFunction !== undefined) {
-		gdriveDelayedFunction();
-	}
-}
-
-var gdrive = (function($) {
+define(["jquery", "core", "file-manager", "async-runner", "base64"], function($, core, fileManager, asyncTaskRunner) {
 
 	var connected = false;
 	var authenticated = false;
-	var doNothing = function() {
-	};
 
 	var gdrive = {};
 
 	// Try to connect Gdrive by downloading client.js
 	function connect(callback) {
-		callback = callback || doNothing;
+		callback = callback || core.doNothing;
 		var asyncTask = {};
 		asyncTask.run = function() {
 			if (connected === true) {
 				asyncTask.success();
 				return;
 			}
-			gdriveDelayedFunction = function() {
+			delayedFunction = function() {
 				asyncTask.success();
 			};
 			$.ajax({
-				url : "https://apis.google.com/js/client.js?onload=runGdriveDelayedFunction",
+				url : "https://apis.google.com/js/client.js?onload=runDelayedFunction",
 				dataType : "script", timeout : AJAX_TIMEOUT
 			}).fail(function() {
 				asyncTask.error();
 			});
 		};
 		asyncTask.onSuccess = function() {
-			gdriveDelayedFunction = undefined;
+			delayedFunction = undefined;
 			connected = true;
 			callback();
 		};
 		asyncTask.onError = function() {
-			gdriveDelayedFunction = undefined;
-			onOffline();
+			delayedFunction = undefined;
+			core.setOffline();
 			callback();
 		};
 		asyncTaskRunner.addTask(asyncTask);
@@ -54,7 +39,7 @@ var gdrive = (function($) {
 
 	// Try to authenticate with Oauth
 	function authenticate(callback, immediate) {
-		callback = callback || doNothing;
+		callback = callback || core.doNothing;
 		if (immediate === undefined) {
 			immediate = true;
 		}
@@ -75,10 +60,10 @@ var gdrive = (function($) {
 					return;
 				}
 				if (immediate === false) {
-					showMessage("Please make sure the Google authorization popup is not blocked by your browser.");
+					core.showMessage("Please make sure the Google authorization popup is not blocked by your browser.");
 				}
 				gapi.auth.authorize({ 'client_id' : GOOGLE_CLIENT_ID,
-					'scope' : SCOPES, 'immediate' : immediate }, function(
+					'scope' : GOOGLE_SCOPES, 'immediate' : immediate }, function(
 					authResult) {
 					if (!authResult || authResult.error) {
 						asyncTask.error();
@@ -114,13 +99,13 @@ var gdrive = (function($) {
 				// Retry as described in Google's best practices
 				asyncTask.retry();
 				return;
-			} else if (error.code === 401) {
+			} else if (error.code === 401 || error.code === 403) {
 				authenticated = false;
 				errorMsg = "Access to Google Drive is not authorized.";
 			} else if (error.code <= 0) {
 				connected = false;
 				authenticated = false;
-				onOffline();
+				core.setOffline();
 			} else {
 				errorMsg = "Google Drive error (" + error.code + ": "
 					+ error.message + ").";
@@ -128,7 +113,7 @@ var gdrive = (function($) {
 		}
 		asyncTask.onError = function() {
 			if (errorMsg !== undefined) {
-				showError(errorMsg);
+				core.showError(errorMsg);
 			}
 			callback();
 		};
@@ -136,7 +121,7 @@ var gdrive = (function($) {
 	}
 
 	function upload(fileId, parentId, title, content, callback) {
-		callback = callback || doNothing;
+		callback = callback || core.doNothing;
 		authenticate(function() {
 			if (connected === false) {
 				callback();
@@ -191,7 +176,7 @@ var gdrive = (function($) {
 					var error = response.error;
 					// If file has been removed from Google Drive
 					if(error !== undefined && fileId !== undefined && error.code === 404) {
-						showMessage('"' + title + '" has been removed from Google Drive.');
+						core.showMessage('"' + title + '" has been removed from Google Drive.');
 						fileManager.removeSync(SYNC_PROVIDER_GDRIVE + fileId);
 						fileManager.updateFileTitles();
 						// Avoid error analyzed by handleError
@@ -209,7 +194,7 @@ var gdrive = (function($) {
 	}
 
 	gdrive.checkUpdates = function(lastChangeId, callback) {
-		callback = callback || doNothing;
+		callback = callback || core.doNothing;
 		authenticate(function() {
 			if (connected === false) {
 				callback();
@@ -263,7 +248,7 @@ var gdrive = (function($) {
 	};
 
 	gdrive.downloadMetadata = function(ids, callback, result) {
-		callback = callback || doNothing;
+		callback = callback || core.doNothing;
 		result = result || [];
 		if(ids.length === 0) {
 			callback(result);
@@ -305,7 +290,7 @@ var gdrive = (function($) {
 	};
 
 	gdrive.downloadContent = function(objects, callback, result) {
-		callback = callback || doNothing;
+		callback = callback || core.doNothing;
 		result = result || [];
 		if(objects.length === 0) {
 			callback(result);
@@ -377,14 +362,14 @@ var gdrive = (function($) {
 		localStorage.removeItem("sync.gdrive.state");
 		state = JSON.parse(state);
 		if (state.action == "create") {
-			upload(undefined, state.folderId, DEFAULT_GDRIVE_FILE_TITLE,
+			upload(undefined, state.folderId, GDRIVE_DEFAULT_FILE_TITLE,
 				"", function(fileSyncIndex) {
 				if(fileSyncIndex === undefined) {
 					return;
 				}
-				var fileIndex = fileManager.createFile(DEFAULT_GDRIVE_FILE_TITLE, "", [fileSyncIndex]);
+				var fileIndex = fileManager.createFile(GDRIVE_DEFAULT_FILE_TITLE, "", [fileSyncIndex]);
 				fileManager.selectFile(fileIndex);
-				showMessage('"' + DEFAULT_GDRIVE_FILE_TITLE + '" created successfully on Google Drive.');
+				core.showMessage('"' + GDRIVE_DEFAULT_FILE_TITLE + '" created successfully on Google Drive.');
 			});
 		}
 		else if (state.action == "open") {
@@ -413,7 +398,7 @@ var gdrive = (function($) {
 						localStorage[fileSyncIndex + ".etag"] = file.etag;
 						var fileIndex = fileManager.createFile(file.title, file.content, [fileSyncIndex]);
 						fileManager.selectFile(fileIndex);
-						showMessage('"' + file.title + '" imported successfully from Google Drive.');
+						core.showMessage('"' + file.title + '" imported successfully from Google Drive.');
 					}
 				});
 			});
@@ -421,4 +406,4 @@ var gdrive = (function($) {
 	};
 
 	return gdrive;
-})(jQuery);
+});
diff --git a/js/jquery.jgrowl.js b/js/jgrowl.js
similarity index 100%
rename from js/jquery.jgrowl.js
rename to js/jgrowl.js
diff --git a/js/jquery-ui.custom.js b/js/jquery-ui.js
similarity index 100%
rename from js/jquery-ui.custom.js
rename to js/jquery-ui.js
diff --git a/js/jquery.layout.js b/js/layout.js
similarity index 100%
rename from js/jquery.layout.js
rename to js/layout.js
diff --git a/js/main.js b/js/main.js
index 6d93bf1c..79e571be 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,511 +1,22 @@
-var currentTime = new Date().getTime();
-
-function showError(msg) {
-	showMessage(msg, "icon-warning-sign");
-}
-
-function showMessage(msg, iconClass, options) {
-	options = options || {};
-	iconClass = iconClass || "icon-info-sign";
-	$.jGrowl("<i class='icon-white " + iconClass + "'></i> " + msg, options);
-}
-
-function showWorkingIndicator(show) {
-	if (show === false) {
-		$(".working-indicator").addClass("hide");
-	} else {
-		$(".working-indicator").removeClass("hide");
-	}
-}
-
-var AJAX_TIMEOUT = 5000;
-var CHECK_ONLINE_PERIOD = 60000;
-var offline = false;
-var offlineTime = currentTime;
-var offlineListeners = [];
-function onOffline() {
-	offlineTime = currentTime;
-	if(offline === false) {
-		offline = true;
-		showMessage("You are offline.", "icon-exclamation-sign msg-offline", {
-			sticky : true, close : function() {
-				showMessage("You are back online!", "icon-signal");
-			} });
-		for(var i=0; i<offlineListeners.length; i++) {
-			offlineListeners[i]();
-		}
-	}
-}
-
-function onOnline() {
-	if(offline === true) {
-		$(".msg-offline").parents(".jGrowl-notification").trigger(
-			'jGrowl.beforeClose');
-		offline = false;
-		for(var i=0; i<offlineListeners.length; i++) {
-			offlineListeners[i]();
-		}
-	}
-}
-
-function checkOnline() {
-	// Try to reconnect if we are offline but we have some network
-	if (offline === true && navigator.onLine === true
-		&& offlineTime + CHECK_ONLINE_PERIOD < currentTime) {
-		offlineTime = currentTime;
-		// Try to download anything to test the connection
-		$.ajax(
-			{ url : "https://apis.google.com/js/client.js",
-				timeout : AJAX_TIMEOUT, dataType : "script" }).done(function() {
-			onOnline();
-		});
-	}
-}
-
-var DEFAULT_FILE_TITLE = "Filename";
-var fileManager = (function($) {
-
-	var fileManager = {};
-
-	var save = false;
-	fileManager.init = function() {
-		gdrive.init();
-		
-		var changeSyncButtonState = function() {
-			if(synchronizer.isRunning() || synchronizer.isQueueEmpty() || offline) {
-				$(".action-force-sync").addClass("disabled");
-			}
-			else {
-				$(".action-force-sync").removeClass("disabled");
-			}
-		};
-		offlineListeners.push(changeSyncButtonState);
-		synchronizer.init({
-			onSyncBegin : changeSyncButtonState,
-			onSyncEnd : changeSyncButtonState,
-			onQueueChanged : changeSyncButtonState
-		});
-		$(".action-force-sync").click(function() {
-			if(!$(this).hasClass("disabled")) {
-				synchronizer.forceSync();
-			}
-		});
-		
-		fileManager.selectFile();
-
-		// Do periodic stuff
-		window.setInterval(function() {
-			currentTime = new Date().getTime();
-			fileManager.saveFile();
-			synchronizer.sync();
-			asyncTaskRunner.runTask();
-			checkOnline();
-		}, 1000);
-
-		$(".action-create-file").click(function() {
-			fileManager.saveFile();
-			var fileIndex = fileManager.createFile();
-			fileManager.selectFile(fileIndex);
-			$("#file-title").click();
-		});
-		$(".action-remove-file").click(function() {
-			fileManager.deleteFile();
-			fileManager.selectFile();
-		});
-		$(".action-refresh-manage-sync").click(refreshManageSync);
-		$("#file-title").click(function() {
-			$(this).hide();
-			$("#file-title-input").show().focus();
-		});
-		$("#file-title-input").blur(function() {
-			var title = $.trim($(this).val());
-			if (title) {
-				var fileIndexTitle = localStorage["file.current"] + ".title";
-				if (title != localStorage[fileIndexTitle]) {
-					localStorage[fileIndexTitle] = title;
-					fileManager.updateFileTitles();
-					save = true;
-				}
-			}
-			$(this).hide();
-			$("#file-title").show();
-		});
-		$(".action-download-md").click(
-			function() {
-				var content = $("#wmd-input").val();
-				var uriContent = "data:application/octet-stream;base64,"
-					+ base64.encode(content);
-				window.open(uriContent, 'file');
-			});
-		$(".action-download-html").click(
-			function() {
-				var content = $("#wmd-preview").html();
-				var uriContent = "data:application/octet-stream;base64,"
-					+ base64.encode(content);
-				window.open(uriContent, 'file');
-			});
-		$(".action-upload-gdrive").click(uploadGdrive);
-		$(".action-upload-dropbox").click(function() {
-			showMessage("Sorry, Dropbox synchronization is not yet available.");
-		});
-	};
-
-	var fileDescList = [];
-	fileManager.selectFile = function(fileIndex) {
-		// If file system does not exist
-		if (!localStorage["file.counter"] || !localStorage["file.list"]) {
-			localStorage.clear();
-			localStorage["file.counter"] = 0;
-			localStorage["file.list"] = ";";
-		}
-		// If no file create one
-		if (localStorage["file.list"].length === 1) {
-			fileIndex = this.createFile();
-		}
-		
-		fileIndex = fileIndex || localStorage["file.current"];
-		if(fileIndex !== undefined) {
-			localStorage["file.current"] = fileIndex;
-		}
-
-		// Update the file titles
-		this.updateFileTitles();
-		// Update the editor
-		var fileIndex = localStorage["file.current"];
-		$("#wmd-input").val(localStorage[fileIndex + ".content"]);
-		core.createEditor(function() {
-			save = true;
-		});
-	};
-
-	fileManager.createFile = function(title, content, syncIndexes) {
-		content = content || "";
-		syncIndexes = syncIndexes || [];
-		if (!title) {
-			// Create a file title 
-			title = DEFAULT_FILE_TITLE;
-			function exists(title) {
-				for ( var i = 0; i < fileDescList.length; i++) {
-					if(fileDescList[i].title == title) {
-						return true;
-					}
-				}
-			}
-			var indicator = 2;
-			while(exists(title)) {
-				title = DEFAULT_FILE_TITLE + indicator++;
-			}
-		}
-		// Create the fileIndex
-		var fileCounter = parseInt(localStorage["file.counter"]);
-		var fileIndex = "file." + fileCounter;
-		// Create the file in the localStorage
-		localStorage[fileIndex + ".content"] = content;
-		localStorage[fileIndex + ".title"] = title;
-		var sync = ";";
-		for(var i=0; i<syncIndexes.length; i++) {
-			sync += syncIndexes[i] + ";";
-		}
-		localStorage[fileIndex + ".sync"] = sync;
-		localStorage["file.counter"] = fileCounter + 1;
-		localStorage["file.list"] += fileIndex + ";";
-		return fileIndex;
-	};
-
-	fileManager.deleteFile = function() {
-		var fileIndex = localStorage["file.current"];
-
-		// Remove synchronized locations
-		var fileSyncIndexList = localStorage[fileIndex + ".sync"].split(";");
-		for ( var i = 1; i < fileSyncIndexList.length - 1; i++) {
-			var fileSyncIndex = fileSyncIndexList[i];
-			fileManager.removeSync(fileSyncIndex);
-		}
-		localStorage.removeItem(fileIndex + ".sync");
-
-		localStorage.removeItem("file.current");
-		localStorage["file.list"] = localStorage["file.list"].replace(";"
-			+ fileIndex + ";", ";");
-		localStorage.removeItem(fileIndex + ".title");
-		localStorage.removeItem(fileIndex + ".content");
-	};
-
-	fileManager.saveFile = function() {
-		if (save) {
-			var content = $("#wmd-input").val();
-			var fileIndex = localStorage["file.current"];
-			localStorage[fileIndex + ".content"] = content;
-			synchronizer.addFileForUpload(fileIndex);
-			save = false;
-		}
-	};
-	
-	fileManager.updateFileTitles = function() {
-		fileDescList = [];
-		$("#file-selector").empty();
-		var fileIndexList = localStorage["file.list"].split(";");
-		for ( var i = 1; i < fileIndexList.length - 1; i++) {
-			var fileIndex = fileIndexList[i];
-			var title = localStorage[fileIndex + ".title"];
-			fileDescList.push({ index : fileIndex, title : title });
-		}
-		fileDescList.sort(function(a, b) {
-			if (a.title.toLowerCase() < b.title.toLowerCase())
-				return -1;
-			if (a.title.toLowerCase() > b.title.toLowerCase())
-				return 1;
-			return 0;
-		});
-
-		var fileIndex = localStorage["file.current"];
-		// If no default file take first one
-		if (!fileIndex) {
-			fileIndex = fileDescList[0].index;
-			localStorage["file.current"] = fileIndex;
-		}
-		
-		syncGoogleDrive = false;
-		function composeTitle(fileIndex) {
-			var result = localStorage[fileIndex + ".title"];
-			var sync = localStorage[fileIndex + ".sync"];
-			if (sync.indexOf(";" + SYNC_PROVIDER_GDRIVE) !== -1) {
-				syncGoogleDrive = true;
-				result = '<i class="icon-gdrive"></i> ' + result;
-			}
-			return result;
-		}
-
-		// Update the file title
-		var title = localStorage[fileIndex + ".title"];
-		document.title = "StackEdit - " + title;
-		$("#file-title").html(composeTitle(fileIndex));
-		$(".file-title").text(title);
-		$("#file-title-input").val(title);
-		
-		// Update the file selector
-		$("#file-selector").empty();
-		for ( var i = 0; i < fileDescList.length; i++) {
-			var fileDesc = fileDescList[i];
-			var a = $("<a>").html(composeTitle(fileDesc.index));
-			var li = $("<li>").append(a);
-			if (fileDesc.index == fileIndex) {
-				li.addClass("disabled");
-			} else {
-				a.prop("href", "#").click((function(fileIndex) {
-					return function() {
-						localStorage["file.current"] = fileIndex;
-						fileManager.selectFile();
-					};
-				})(fileDesc.index));
-			}
-			$("#file-selector").append(li);
-		}
-	};
-
-	// Remove a synchronized location
-	fileManager.removeSync = function(fileSyncIndex) {
-		var fileIndexList = localStorage["file.list"].split(";");
-		// Look for local files associated to this synchronized location 
-		for ( var i = 1; i < fileIndexList.length - 1; i++) {
-			var fileIndexSync = fileIndexList[i] + ".sync";
-			localStorage[fileIndexSync] = localStorage[fileIndexSync].replace(";"
-				+ fileSyncIndex + ";", ";");
-		}
-		// Remove etag
-		localStorage.removeItem(fileSyncIndex + ".etag");
-	};
-	
-	// Look for local file associated to a synchronized location 
-	fileManager.getFileIndexFromSync = function(fileSyncIndex) {
-		var fileIndex = undefined;
-		var fileIndexList = localStorage["file.list"].split(";");
-		for ( var i = 1; i < fileIndexList.length - 1; i++) {
-			var tempFileIndex = fileIndexList[i];
-			var sync = localStorage[tempFileIndex + ".sync"];
-			if (sync.indexOf(";" + fileSyncIndex + ";") !== -1) {
-				fileIndex = tempFileIndex;
-				break;
-			}
-		}
-		return fileIndex;
-	};
-
-	function uploadGdrive() {
-		$(".file-sync-indicator").removeClass("hide");
-		var fileIndex = localStorage["file.current"];
-		var content = localStorage[fileIndex + ".content"];
-		var title = localStorage[fileIndex + ".title"];
-		gdrive.createFile(title, content, function(fileSyncIndex) {
-			if (fileSyncIndex) {
-				localStorage[fileIndex + ".sync"] += fileSyncIndex + ";";
-				fileManager.updateFileTitles();
-				showMessage('The file "' + title
-					+ '" will now be synchronized on Google Drive.');
-			} else {
-				showError("Error while creating file on Google Drive.");
-			}
-		});
-	}
-
-	function refreshManageSync() {
-		var fileIndex = localStorage["file.current"];
-		var fileSyncIndexList = localStorage[fileIndex + ".sync"].split(";");
-		$(".msg-no-sync, .msg-sync-list").addClass("hide");
-		$("#manage-sync-list .input-append").remove();
-		if (fileSyncIndexList.length > 2) {
-			$(".msg-sync-list").removeClass("hide");
-		} else {
-			$(".msg-no-sync").removeClass("hide");
-		}
-		for ( var i = 1; i < fileSyncIndexList.length - 1; i++) {
-			var fileSyncIndex = fileSyncIndexList[i];
-			(function(fileSyncIndex) {
-				var line = $("<div>").addClass("input-append");
-				if (fileSyncIndex.indexOf(SYNC_PROVIDER_GDRIVE) === 0) {
-					line.append($("<input>").prop("type", "text").prop(
-						"disabled", true).addClass("span5").val(
-						"Google Drive, FileID="
-							+ fileSyncIndex.substring(SYNC_PROVIDER_GDRIVE.length)));
-					line.append($("<a>").addClass("btn").html(
-						'<i class="icon-trash"></i>').prop("title",
-						"Remove this synchronized location").click(function() {
-						fileManager.removeSync(fileSyncIndex);
-						fileManager.updateFileTitles();
-						refreshManageSync();
-					}));
-				}
-				$("#manage-sync-list").append(line);
-			})(fileSyncIndex);
-		}
-	}
-
-	return fileManager;
-})(jQuery);
-
-var core = (function($) {
-	var core = {};
-
-	core.init = function() {
-		this.loadSettings();
-		this.createLayout();
-
-		$(".action-load-settings").click(function() {
-			core.loadSettings();
-		});
-
-		$(".action-apply-settings").click(function() {
-			core.saveSettings();
-			fileManager.saveFile();
-			location.reload();
-		});
-	};
-
-	var settings = { layoutOrientation : "horizontal" };
-	core.loadSettings = function() {
-		if (localStorage.settings) {
-			$.extend(settings, JSON.parse(localStorage.settings));
-		}
-
-		// Layout orientation
-		$(
-			"input:radio[name=radio-layout-orientation][value="
-				+ settings.layoutOrientation + "]").prop("checked", true);
-	};
-
-	core.saveSettings = function() {
-
-		// Layout orientation
-		settings.layoutOrientation = $(
-			"input:radio[name=radio-layout-orientation]:checked").prop("value");
-
-		localStorage.settings = JSON.stringify(settings);
-	};
-
-	core.createLayout = function() {
-		var layout = undefined;
-		var layoutGlobalConfig = { closable : true, resizable : false,
-			slidable : false, livePaneResizing : true,
-			enableCursorHotkey : false, spacing_open : 15, spacing_closed : 15,
-			togglerLength_open : 90, togglerLength_closed : 90,
-			center__minWidth : 100, center__minHeight : 100,
-			stateManagement__enabled : false, };
-		if (settings.layoutOrientation == "horizontal") {
-			$(".ui-layout-south").remove();
-			$(".ui-layout-east").addClass("well").prop("id", "wmd-preview");
-			layout = $('body').layout(
-				$.extend(layoutGlobalConfig, { east__resizable : true,
-					east__size : .5, east__minSize : 200 }));
-		} else if (settings.layoutOrientation == "vertical") {
-			$(".ui-layout-east").remove();
-			$(".ui-layout-south").addClass("well").prop("id", "wmd-preview");
-			layout = $('body').layout(
-				$.extend(layoutGlobalConfig, { south__resizable : true,
-					south__size : .5, south__minSize : 200 }));
-		}
-		$(".ui-layout-toggler-north").addClass("btn").append(
-			$("<b>").addClass("caret"));
-		$(".ui-layout-toggler-south").addClass("btn").append(
-			$("<b>").addClass("caret"));
-		$(".ui-layout-toggler-east").addClass("btn").append(
-			$("<b>").addClass("caret"));
-		$("#navbar").click(function() {
-			layout.allowOverflow('north');
-		});
-	};
-
-	core.createEditor = function(onTextChange) {
-		$("#wmd-button-bar").empty();
-		var converter = Markdown.getSanitizingConverter();
-		var firstChange = true;
-		converter.hooks.chain("preConversion", function(text) {
-			if (!firstChange) {
-				onTextChange();
-			}
-			return text;
-		});
-		var editor = new Markdown.Editor(converter);
-		editor.run();
-		firstChange = false;
-
-		$(".wmd-button-row").addClass("btn-group").find("li:not(.wmd-spacer)")
-			.addClass("btn").css("left", 0).find("span").hide();
-		$("#wmd-bold-button").append($("<i>").addClass("icon-bold"));
-		$("#wmd-italic-button").append($("<i>").addClass("icon-italic"));
-		$("#wmd-link-button").append($("<i>").addClass("icon-globe"));
-		$("#wmd-quote-button").append($("<i>").addClass("icon-indent-left"));
-		$("#wmd-code-button").append($("<i>").addClass("icon-code"));
-		$("#wmd-image-button").append($("<i>").addClass("icon-picture"));
-		$("#wmd-olist-button").append($("<i>").addClass("icon-numbered-list"));
-		$("#wmd-ulist-button").append($("<i>").addClass("icon-list"));
-		$("#wmd-heading-button").append($("<i>").addClass("icon-text-height"));
-		$("#wmd-hr-button").append($("<i>").addClass("icon-hr"));
-		$("#wmd-undo-button").append($("<i>").addClass("icon-undo"));
-		$("#wmd-redo-button").append($("<i>").addClass("icon-share-alt"));
-	};
-
-	return core;
-})(jQuery);
-
-(function($) {
-
+requirejs.config({
+    paths: {
+        custo: [
+            'dev/custo',
+            'prod/custo'
+        ]
+    },
+    shim: {
+        'jquery-ui': ['jquery'],
+        'bootstrap': ['jquery'],
+        'jgrowl': ['jquery'],
+        'layout': ['jquery-ui'],
+        'Markdown.Sanitizer': ['Markdown.Converter'],
+        'Markdown.Editor': ['Markdown.Sanitizer']
+    }
+});
+require(["jquery", "core", "file-manager", "config", "custo"], function($, core, fileManager) {
 	$(function() {
-
-		// jGrowl configuration
-		$.jGrowl.defaults.life = 5000;
-		$.jGrowl.defaults.closer = false;
-		$.jGrowl.defaults.closeTemplate = '';
-		$.jGrowl.defaults.position = 'bottom-right';
-		
 		core.init();
-
-		// listen to online/offline events
-		$(window).on('offline', onOffline);
-		$(window).on('online', onOnline);
-		if (navigator.onLine === false) {
-			onOffline();
-		}
-
 		fileManager.init();
 	});
-
-})(jQuery);
+});
diff --git a/js/prod/custo.js b/js/prod/custo.js
new file mode 100644
index 00000000..2adf693f
--- /dev/null
+++ b/js/prod/custo.js
@@ -0,0 +1 @@
+var GOOGLE_CLIENT_ID = '241271498917-jpto9lls9fqnem1e4h6ppds9uob8rpvu.apps.googleusercontent.com';
diff --git a/js/require.js b/js/require.js
new file mode 100644
index 00000000..062516ac
--- /dev/null
+++ b/js/require.js
@@ -0,0 +1,2019 @@
+/** vim: et:ts=4:sw=4:sts=4
+ * @license RequireJS 2.1.5 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/requirejs for details
+ */
+//Not using strict: uneven strict support in browsers, #392, and causes
+//problems with requirejs.exec()/transpiler plugins that may not be strict.
+/*jslint regexp: true, nomen: true, sloppy: true */
+/*global window, navigator, document, importScripts, setTimeout, opera */
+
+var requirejs, require, define;
+(function (global) {
+    var req, s, head, baseElement, dataMain, src,
+        interactiveScript, currentlyAddingScript, mainScript, subPath,
+        version = '2.1.5',
+        commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
+        cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
+        jsSuffixRegExp = /\.js$/,
+        currDirRegExp = /^\.\//,
+        op = Object.prototype,
+        ostring = op.toString,
+        hasOwn = op.hasOwnProperty,
+        ap = Array.prototype,
+        apsp = ap.splice,
+        isBrowser = !!(typeof window !== 'undefined' && navigator && document),
+        isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
+        //PS3 indicates loaded and complete, but need to wait for complete
+        //specifically. Sequence is 'loading', 'loaded', execution,
+        // then 'complete'. The UA check is unfortunate, but not sure how
+        //to feature test w/o causing perf issues.
+        readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ?
+                      /^complete$/ : /^(complete|loaded)$/,
+        defContextName = '_',
+        //Oh the tragedy, detecting opera. See the usage of isOpera for reason.
+        isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]',
+        contexts = {},
+        cfg = {},
+        globalDefQueue = [],
+        useInteractive = false;
+
+    function isFunction(it) {
+        return ostring.call(it) === '[object Function]';
+    }
+
+    function isArray(it) {
+        return ostring.call(it) === '[object Array]';
+    }
+
+    /**
+     * Helper function for iterating over an array. If the func returns
+     * a true value, it will break out of the loop.
+     */
+    function each(ary, func) {
+        if (ary) {
+            var i;
+            for (i = 0; i < ary.length; i += 1) {
+                if (ary[i] && func(ary[i], i, ary)) {
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Helper function for iterating over an array backwards. If the func
+     * returns a true value, it will break out of the loop.
+     */
+    function eachReverse(ary, func) {
+        if (ary) {
+            var i;
+            for (i = ary.length - 1; i > -1; i -= 1) {
+                if (ary[i] && func(ary[i], i, ary)) {
+                    break;
+                }
+            }
+        }
+    }
+
+    function hasProp(obj, prop) {
+        return hasOwn.call(obj, prop);
+    }
+
+    function getOwn(obj, prop) {
+        return hasProp(obj, prop) && obj[prop];
+    }
+
+    /**
+     * Cycles over properties in an object and calls a function for each
+     * property value. If the function returns a truthy value, then the
+     * iteration is stopped.
+     */
+    function eachProp(obj, func) {
+        var prop;
+        for (prop in obj) {
+            if (hasProp(obj, prop)) {
+                if (func(obj[prop], prop)) {
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Simple function to mix in properties from source into target,
+     * but only if target does not already have a property of the same name.
+     */
+    function mixin(target, source, force, deepStringMixin) {
+        if (source) {
+            eachProp(source, function (value, prop) {
+                if (force || !hasProp(target, prop)) {
+                    if (deepStringMixin && typeof value !== 'string') {
+                        if (!target[prop]) {
+                            target[prop] = {};
+                        }
+                        mixin(target[prop], value, force, deepStringMixin);
+                    } else {
+                        target[prop] = value;
+                    }
+                }
+            });
+        }
+        return target;
+    }
+
+    //Similar to Function.prototype.bind, but the 'this' object is specified
+    //first, since it is easier to read/figure out what 'this' will be.
+    function bind(obj, fn) {
+        return function () {
+            return fn.apply(obj, arguments);
+        };
+    }
+
+    function scripts() {
+        return document.getElementsByTagName('script');
+    }
+
+    //Allow getting a global that expressed in
+    //dot notation, like 'a.b.c'.
+    function getGlobal(value) {
+        if (!value) {
+            return value;
+        }
+        var g = global;
+        each(value.split('.'), function (part) {
+            g = g[part];
+        });
+        return g;
+    }
+
+    /**
+     * Constructs an error with a pointer to an URL with more information.
+     * @param {String} id the error ID that maps to an ID on a web page.
+     * @param {String} message human readable error.
+     * @param {Error} [err] the original error, if there is one.
+     *
+     * @returns {Error}
+     */
+    function makeError(id, msg, err, requireModules) {
+        var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
+        e.requireType = id;
+        e.requireModules = requireModules;
+        if (err) {
+            e.originalError = err;
+        }
+        return e;
+    }
+
+    if (typeof define !== 'undefined') {
+        //If a define is already in play via another AMD loader,
+        //do not overwrite.
+        return;
+    }
+
+    if (typeof requirejs !== 'undefined') {
+        if (isFunction(requirejs)) {
+            //Do not overwrite and existing requirejs instance.
+            return;
+        }
+        cfg = requirejs;
+        requirejs = undefined;
+    }
+
+    //Allow for a require config object
+    if (typeof require !== 'undefined' && !isFunction(require)) {
+        //assume it is a config object.
+        cfg = require;
+        require = undefined;
+    }
+
+    function newContext(contextName) {
+        var inCheckLoaded, Module, context, handlers,
+            checkLoadedTimeoutId,
+            config = {
+                //Defaults. Do not set a default for map
+                //config to speed up normalize(), which
+                //will run faster if there is no default.
+                waitSeconds: 7,
+                baseUrl: './',
+                paths: {},
+                pkgs: {},
+                shim: {},
+                config: {}
+            },
+            registry = {},
+            //registry of just enabled modules, to speed
+            //cycle breaking code when lots of modules
+            //are registered, but not activated.
+            enabledRegistry = {},
+            undefEvents = {},
+            defQueue = [],
+            defined = {},
+            urlFetched = {},
+            requireCounter = 1,
+            unnormalizedCounter = 1;
+
+        /**
+         * Trims the . and .. from an array of path segments.
+         * It will keep a leading path segment if a .. will become
+         * the first path segment, to help with module name lookups,
+         * which act like paths, but can be remapped. But the end result,
+         * all paths that use this function should look normalized.
+         * NOTE: this method MODIFIES the input array.
+         * @param {Array} ary the array of path segments.
+         */
+        function trimDots(ary) {
+            var i, part;
+            for (i = 0; ary[i]; i += 1) {
+                part = ary[i];
+                if (part === '.') {
+                    ary.splice(i, 1);
+                    i -= 1;
+                } else if (part === '..') {
+                    if (i === 1 && (ary[2] === '..' || ary[0] === '..')) {
+                        //End of the line. Keep at least one non-dot
+                        //path segment at the front so it can be mapped
+                        //correctly to disk. Otherwise, there is likely
+                        //no path mapping for a path starting with '..'.
+                        //This can still fail, but catches the most reasonable
+                        //uses of ..
+                        break;
+                    } else if (i > 0) {
+                        ary.splice(i - 1, 2);
+                        i -= 2;
+                    }
+                }
+            }
+        }
+
+        /**
+         * Given a relative module name, like ./something, normalize it to
+         * a real name that can be mapped to a path.
+         * @param {String} name the relative name
+         * @param {String} baseName a real name that the name arg is relative
+         * to.
+         * @param {Boolean} applyMap apply the map config to the value. Should
+         * only be done if this normalization is for a dependency ID.
+         * @returns {String} normalized name
+         */
+        function normalize(name, baseName, applyMap) {
+            var pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment,
+                foundMap, foundI, foundStarMap, starI,
+                baseParts = baseName && baseName.split('/'),
+                normalizedBaseParts = baseParts,
+                map = config.map,
+                starMap = map && map['*'];
+
+            //Adjust any relative paths.
+            if (name && name.charAt(0) === '.') {
+                //If have a base name, try to normalize against it,
+                //otherwise, assume it is a top-level require that will
+                //be relative to baseUrl in the end.
+                if (baseName) {
+                    if (getOwn(config.pkgs, baseName)) {
+                        //If the baseName is a package name, then just treat it as one
+                        //name to concat the name with.
+                        normalizedBaseParts = baseParts = [baseName];
+                    } else {
+                        //Convert baseName to array, and lop off the last part,
+                        //so that . matches that 'directory' and not name of the baseName's
+                        //module. For instance, baseName of 'one/two/three', maps to
+                        //'one/two/three.js', but we want the directory, 'one/two' for
+                        //this normalization.
+                        normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
+                    }
+
+                    name = normalizedBaseParts.concat(name.split('/'));
+                    trimDots(name);
+
+                    //Some use of packages may use a . path to reference the
+                    //'main' module name, so normalize for that.
+                    pkgConfig = getOwn(config.pkgs, (pkgName = name[0]));
+                    name = name.join('/');
+                    if (pkgConfig && name === pkgName + '/' + pkgConfig.main) {
+                        name = pkgName;
+                    }
+                } else if (name.indexOf('./') === 0) {
+                    // No baseName, so this is ID is resolved relative
+                    // to baseUrl, pull off the leading dot.
+                    name = name.substring(2);
+                }
+            }
+
+            //Apply map config if available.
+            if (applyMap && map && (baseParts || starMap)) {
+                nameParts = name.split('/');
+
+                for (i = nameParts.length; i > 0; i -= 1) {
+                    nameSegment = nameParts.slice(0, i).join('/');
+
+                    if (baseParts) {
+                        //Find the longest baseName segment match in the config.
+                        //So, do joins on the biggest to smallest lengths of baseParts.
+                        for (j = baseParts.length; j > 0; j -= 1) {
+                            mapValue = getOwn(map, baseParts.slice(0, j).join('/'));
+
+                            //baseName segment has config, find if it has one for
+                            //this name.
+                            if (mapValue) {
+                                mapValue = getOwn(mapValue, nameSegment);
+                                if (mapValue) {
+                                    //Match, update name to the new value.
+                                    foundMap = mapValue;
+                                    foundI = i;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    if (foundMap) {
+                        break;
+                    }
+
+                    //Check for a star map match, but just hold on to it,
+                    //if there is a shorter segment match later in a matching
+                    //config, then favor over this star map.
+                    if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) {
+                        foundStarMap = getOwn(starMap, nameSegment);
+                        starI = i;
+                    }
+                }
+
+                if (!foundMap && foundStarMap) {
+                    foundMap = foundStarMap;
+                    foundI = starI;
+                }
+
+                if (foundMap) {
+                    nameParts.splice(0, foundI, foundMap);
+                    name = nameParts.join('/');
+                }
+            }
+
+            return name;
+        }
+
+        function removeScript(name) {
+            if (isBrowser) {
+                each(scripts(), function (scriptNode) {
+                    if (scriptNode.getAttribute('data-requiremodule') === name &&
+                            scriptNode.getAttribute('data-requirecontext') === context.contextName) {
+                        scriptNode.parentNode.removeChild(scriptNode);
+                        return true;
+                    }
+                });
+            }
+        }
+
+        function hasPathFallback(id) {
+            var pathConfig = getOwn(config.paths, id);
+            if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
+                removeScript(id);
+                //Pop off the first array value, since it failed, and
+                //retry
+                pathConfig.shift();
+                context.require.undef(id);
+                context.require([id]);
+                return true;
+            }
+        }
+
+        //Turns a plugin!resource to [plugin, resource]
+        //with the plugin being undefined if the name
+        //did not have a plugin prefix.
+        function splitPrefix(name) {
+            var prefix,
+                index = name ? name.indexOf('!') : -1;
+            if (index > -1) {
+                prefix = name.substring(0, index);
+                name = name.substring(index + 1, name.length);
+            }
+            return [prefix, name];
+        }
+
+        /**
+         * Creates a module mapping that includes plugin prefix, module
+         * name, and path. If parentModuleMap is provided it will
+         * also normalize the name via require.normalize()
+         *
+         * @param {String} name the module name
+         * @param {String} [parentModuleMap] parent module map
+         * for the module name, used to resolve relative names.
+         * @param {Boolean} isNormalized: is the ID already normalized.
+         * This is true if this call is done for a define() module ID.
+         * @param {Boolean} applyMap: apply the map config to the ID.
+         * Should only be true if this map is for a dependency.
+         *
+         * @returns {Object}
+         */
+        function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) {
+            var url, pluginModule, suffix, nameParts,
+                prefix = null,
+                parentName = parentModuleMap ? parentModuleMap.name : null,
+                originalName = name,
+                isDefine = true,
+                normalizedName = '';
+
+            //If no name, then it means it is a require call, generate an
+            //internal name.
+            if (!name) {
+                isDefine = false;
+                name = '_@r' + (requireCounter += 1);
+            }
+
+            nameParts = splitPrefix(name);
+            prefix = nameParts[0];
+            name = nameParts[1];
+
+            if (prefix) {
+                prefix = normalize(prefix, parentName, applyMap);
+                pluginModule = getOwn(defined, prefix);
+            }
+
+            //Account for relative paths if there is a base name.
+            if (name) {
+                if (prefix) {
+                    if (pluginModule && pluginModule.normalize) {
+                        //Plugin is loaded, use its normalize method.
+                        normalizedName = pluginModule.normalize(name, function (name) {
+                            return normalize(name, parentName, applyMap);
+                        });
+                    } else {
+                        normalizedName = normalize(name, parentName, applyMap);
+                    }
+                } else {
+                    //A regular module.
+                    normalizedName = normalize(name, parentName, applyMap);
+
+                    //Normalized name may be a plugin ID due to map config
+                    //application in normalize. The map config values must
+                    //already be normalized, so do not need to redo that part.
+                    nameParts = splitPrefix(normalizedName);
+                    prefix = nameParts[0];
+                    normalizedName = nameParts[1];
+                    isNormalized = true;
+
+                    url = context.nameToUrl(normalizedName);
+                }
+            }
+
+            //If the id is a plugin id that cannot be determined if it needs
+            //normalization, stamp it with a unique ID so two matching relative
+            //ids that may conflict can be separate.
+            suffix = prefix && !pluginModule && !isNormalized ?
+                     '_unnormalized' + (unnormalizedCounter += 1) :
+                     '';
+
+            return {
+                prefix: prefix,
+                name: normalizedName,
+                parentMap: parentModuleMap,
+                unnormalized: !!suffix,
+                url: url,
+                originalName: originalName,
+                isDefine: isDefine,
+                id: (prefix ?
+                        prefix + '!' + normalizedName :
+                        normalizedName) + suffix
+            };
+        }
+
+        function getModule(depMap) {
+            var id = depMap.id,
+                mod = getOwn(registry, id);
+
+            if (!mod) {
+                mod = registry[id] = new context.Module(depMap);
+            }
+
+            return mod;
+        }
+
+        function on(depMap, name, fn) {
+            var id = depMap.id,
+                mod = getOwn(registry, id);
+
+            if (hasProp(defined, id) &&
+                    (!mod || mod.defineEmitComplete)) {
+                if (name === 'defined') {
+                    fn(defined[id]);
+                }
+            } else {
+                getModule(depMap).on(name, fn);
+            }
+        }
+
+        function onError(err, errback) {
+            var ids = err.requireModules,
+                notified = false;
+
+            if (errback) {
+                errback(err);
+            } else {
+                each(ids, function (id) {
+                    var mod = getOwn(registry, id);
+                    if (mod) {
+                        //Set error on module, so it skips timeout checks.
+                        mod.error = err;
+                        if (mod.events.error) {
+                            notified = true;
+                            mod.emit('error', err);
+                        }
+                    }
+                });
+
+                if (!notified) {
+                    req.onError(err);
+                }
+            }
+        }
+
+        /**
+         * Internal method to transfer globalQueue items to this context's
+         * defQueue.
+         */
+        function takeGlobalQueue() {
+            //Push all the globalDefQueue items into the context's defQueue
+            if (globalDefQueue.length) {
+                //Array splice in the values since the context code has a
+                //local var ref to defQueue, so cannot just reassign the one
+                //on context.
+                apsp.apply(defQueue,
+                           [defQueue.length - 1, 0].concat(globalDefQueue));
+                globalDefQueue = [];
+            }
+        }
+
+        handlers = {
+            'require': function (mod) {
+                if (mod.require) {
+                    return mod.require;
+                } else {
+                    return (mod.require = context.makeRequire(mod.map));
+                }
+            },
+            'exports': function (mod) {
+                mod.usingExports = true;
+                if (mod.map.isDefine) {
+                    if (mod.exports) {
+                        return mod.exports;
+                    } else {
+                        return (mod.exports = defined[mod.map.id] = {});
+                    }
+                }
+            },
+            'module': function (mod) {
+                if (mod.module) {
+                    return mod.module;
+                } else {
+                    return (mod.module = {
+                        id: mod.map.id,
+                        uri: mod.map.url,
+                        config: function () {
+                            return (config.config && getOwn(config.config, mod.map.id)) || {};
+                        },
+                        exports: defined[mod.map.id]
+                    });
+                }
+            }
+        };
+
+        function cleanRegistry(id) {
+            //Clean up machinery used for waiting modules.
+            delete registry[id];
+            delete enabledRegistry[id];
+        }
+
+        function breakCycle(mod, traced, processed) {
+            var id = mod.map.id;
+
+            if (mod.error) {
+                mod.emit('error', mod.error);
+            } else {
+                traced[id] = true;
+                each(mod.depMaps, function (depMap, i) {
+                    var depId = depMap.id,
+                        dep = getOwn(registry, depId);
+
+                    //Only force things that have not completed
+                    //being defined, so still in the registry,
+                    //and only if it has not been matched up
+                    //in the module already.
+                    if (dep && !mod.depMatched[i] && !processed[depId]) {
+                        if (getOwn(traced, depId)) {
+                            mod.defineDep(i, defined[depId]);
+                            mod.check(); //pass false?
+                        } else {
+                            breakCycle(dep, traced, processed);
+                        }
+                    }
+                });
+                processed[id] = true;
+            }
+        }
+
+        function checkLoaded() {
+            var map, modId, err, usingPathFallback,
+                waitInterval = config.waitSeconds * 1000,
+                //It is possible to disable the wait interval by using waitSeconds of 0.
+                expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(),
+                noLoads = [],
+                reqCalls = [],
+                stillLoading = false,
+                needCycleCheck = true;
+
+            //Do not bother if this call was a result of a cycle break.
+            if (inCheckLoaded) {
+                return;
+            }
+
+            inCheckLoaded = true;
+
+            //Figure out the state of all the modules.
+            eachProp(enabledRegistry, function (mod) {
+                map = mod.map;
+                modId = map.id;
+
+                //Skip things that are not enabled or in error state.
+                if (!mod.enabled) {
+                    return;
+                }
+
+                if (!map.isDefine) {
+                    reqCalls.push(mod);
+                }
+
+                if (!mod.error) {
+                    //If the module should be executed, and it has not
+                    //been inited and time is up, remember it.
+                    if (!mod.inited && expired) {
+                        if (hasPathFallback(modId)) {
+                            usingPathFallback = true;
+                            stillLoading = true;
+                        } else {
+                            noLoads.push(modId);
+                            removeScript(modId);
+                        }
+                    } else if (!mod.inited && mod.fetched && map.isDefine) {
+                        stillLoading = true;
+                        if (!map.prefix) {
+                            //No reason to keep looking for unfinished
+                            //loading. If the only stillLoading is a
+                            //plugin resource though, keep going,
+                            //because it may be that a plugin resource
+                            //is waiting on a non-plugin cycle.
+                            return (needCycleCheck = false);
+                        }
+                    }
+                }
+            });
+
+            if (expired && noLoads.length) {
+                //If wait time expired, throw error of unloaded modules.
+                err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads);
+                err.contextName = context.contextName;
+                return onError(err);
+            }
+
+            //Not expired, check for a cycle.
+            if (needCycleCheck) {
+                each(reqCalls, function (mod) {
+                    breakCycle(mod, {}, {});
+                });
+            }
+
+            //If still waiting on loads, and the waiting load is something
+            //other than a plugin resource, or there are still outstanding
+            //scripts, then just try back later.
+            if ((!expired || usingPathFallback) && stillLoading) {
+                //Something is still waiting to load. Wait for it, but only
+                //if a timeout is not already in effect.
+                if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) {
+                    checkLoadedTimeoutId = setTimeout(function () {
+                        checkLoadedTimeoutId = 0;
+                        checkLoaded();
+                    }, 50);
+                }
+            }
+
+            inCheckLoaded = false;
+        }
+
+        Module = function (map) {
+            this.events = getOwn(undefEvents, map.id) || {};
+            this.map = map;
+            this.shim = getOwn(config.shim, map.id);
+            this.depExports = [];
+            this.depMaps = [];
+            this.depMatched = [];
+            this.pluginMaps = {};
+            this.depCount = 0;
+
+            /* this.exports this.factory
+               this.depMaps = [],
+               this.enabled, this.fetched
+            */
+        };
+
+        Module.prototype = {
+            init: function (depMaps, factory, errback, options) {
+                options = options || {};
+
+                //Do not do more inits if already done. Can happen if there
+                //are multiple define calls for the same module. That is not
+                //a normal, common case, but it is also not unexpected.
+                if (this.inited) {
+                    return;
+                }
+
+                this.factory = factory;
+
+                if (errback) {
+                    //Register for errors on this module.
+                    this.on('error', errback);
+                } else if (this.events.error) {
+                    //If no errback already, but there are error listeners
+                    //on this module, set up an errback to pass to the deps.
+                    errback = bind(this, function (err) {
+                        this.emit('error', err);
+                    });
+                }
+
+                //Do a copy of the dependency array, so that
+                //source inputs are not modified. For example
+                //"shim" deps are passed in here directly, and
+                //doing a direct modification of the depMaps array
+                //would affect that config.
+                this.depMaps = depMaps && depMaps.slice(0);
+
+                this.errback = errback;
+
+                //Indicate this module has be initialized
+                this.inited = true;
+
+                this.ignore = options.ignore;
+
+                //Could have option to init this module in enabled mode,
+                //or could have been previously marked as enabled. However,
+                //the dependencies are not known until init is called. So
+                //if enabled previously, now trigger dependencies as enabled.
+                if (options.enabled || this.enabled) {
+                    //Enable this module and dependencies.
+                    //Will call this.check()
+                    this.enable();
+                } else {
+                    this.check();
+                }
+            },
+
+            defineDep: function (i, depExports) {
+                //Because of cycles, defined callback for a given
+                //export can be called more than once.
+                if (!this.depMatched[i]) {
+                    this.depMatched[i] = true;
+                    this.depCount -= 1;
+                    this.depExports[i] = depExports;
+                }
+            },
+
+            fetch: function () {
+                if (this.fetched) {
+                    return;
+                }
+                this.fetched = true;
+
+                context.startTime = (new Date()).getTime();
+
+                var map = this.map;
+
+                //If the manager is for a plugin managed resource,
+                //ask the plugin to load it now.
+                if (this.shim) {
+                    context.makeRequire(this.map, {
+                        enableBuildCallback: true
+                    })(this.shim.deps || [], bind(this, function () {
+                        return map.prefix ? this.callPlugin() : this.load();
+                    }));
+                } else {
+                    //Regular dependency.
+                    return map.prefix ? this.callPlugin() : this.load();
+                }
+            },
+
+            load: function () {
+                var url = this.map.url;
+
+                //Regular dependency.
+                if (!urlFetched[url]) {
+                    urlFetched[url] = true;
+                    context.load(this.map.id, url);
+                }
+            },
+
+            /**
+             * Checks if the module is ready to define itself, and if so,
+             * define it.
+             */
+            check: function () {
+                if (!this.enabled || this.enabling) {
+                    return;
+                }
+
+                var err, cjsModule,
+                    id = this.map.id,
+                    depExports = this.depExports,
+                    exports = this.exports,
+                    factory = this.factory;
+
+                if (!this.inited) {
+                    this.fetch();
+                } else if (this.error) {
+                    this.emit('error', this.error);
+                } else if (!this.defining) {
+                    //The factory could trigger another require call
+                    //that would result in checking this module to
+                    //define itself again. If already in the process
+                    //of doing that, skip this work.
+                    this.defining = true;
+
+                    if (this.depCount < 1 && !this.defined) {
+                        if (isFunction(factory)) {
+                            //If there is an error listener, favor passing
+                            //to that instead of throwing an error.
+                            if (this.events.error) {
+                                try {
+                                    exports = context.execCb(id, factory, depExports, exports);
+                                } catch (e) {
+                                    err = e;
+                                }
+                            } else {
+                                exports = context.execCb(id, factory, depExports, exports);
+                            }
+
+                            if (this.map.isDefine) {
+                                //If setting exports via 'module' is in play,
+                                //favor that over return value and exports. After that,
+                                //favor a non-undefined return value over exports use.
+                                cjsModule = this.module;
+                                if (cjsModule &&
+                                        cjsModule.exports !== undefined &&
+                                        //Make sure it is not already the exports value
+                                        cjsModule.exports !== this.exports) {
+                                    exports = cjsModule.exports;
+                                } else if (exports === undefined && this.usingExports) {
+                                    //exports already set the defined value.
+                                    exports = this.exports;
+                                }
+                            }
+
+                            if (err) {
+                                err.requireMap = this.map;
+                                err.requireModules = [this.map.id];
+                                err.requireType = 'define';
+                                return onError((this.error = err));
+                            }
+
+                        } else {
+                            //Just a literal value
+                            exports = factory;
+                        }
+
+                        this.exports = exports;
+
+                        if (this.map.isDefine && !this.ignore) {
+                            defined[id] = exports;
+
+                            if (req.onResourceLoad) {
+                                req.onResourceLoad(context, this.map, this.depMaps);
+                            }
+                        }
+
+                        //Clean up
+                        cleanRegistry(id);
+
+                        this.defined = true;
+                    }
+
+                    //Finished the define stage. Allow calling check again
+                    //to allow define notifications below in the case of a
+                    //cycle.
+                    this.defining = false;
+
+                    if (this.defined && !this.defineEmitted) {
+                        this.defineEmitted = true;
+                        this.emit('defined', this.exports);
+                        this.defineEmitComplete = true;
+                    }
+
+                }
+            },
+
+            callPlugin: function () {
+                var map = this.map,
+                    id = map.id,
+                    //Map already normalized the prefix.
+                    pluginMap = makeModuleMap(map.prefix);
+
+                //Mark this as a dependency for this plugin, so it
+                //can be traced for cycles.
+                this.depMaps.push(pluginMap);
+
+                on(pluginMap, 'defined', bind(this, function (plugin) {
+                    var load, normalizedMap, normalizedMod,
+                        name = this.map.name,
+                        parentName = this.map.parentMap ? this.map.parentMap.name : null,
+                        localRequire = context.makeRequire(map.parentMap, {
+                            enableBuildCallback: true
+                        });
+
+                    //If current map is not normalized, wait for that
+                    //normalized name to load instead of continuing.
+                    if (this.map.unnormalized) {
+                        //Normalize the ID if the plugin allows it.
+                        if (plugin.normalize) {
+                            name = plugin.normalize(name, function (name) {
+                                return normalize(name, parentName, true);
+                            }) || '';
+                        }
+
+                        //prefix and name should already be normalized, no need
+                        //for applying map config again either.
+                        normalizedMap = makeModuleMap(map.prefix + '!' + name,
+                                                      this.map.parentMap);
+                        on(normalizedMap,
+                            'defined', bind(this, function (value) {
+                                this.init([], function () { return value; }, null, {
+                                    enabled: true,
+                                    ignore: true
+                                });
+                            }));
+
+                        normalizedMod = getOwn(registry, normalizedMap.id);
+                        if (normalizedMod) {
+                            //Mark this as a dependency for this plugin, so it
+                            //can be traced for cycles.
+                            this.depMaps.push(normalizedMap);
+
+                            if (this.events.error) {
+                                normalizedMod.on('error', bind(this, function (err) {
+                                    this.emit('error', err);
+                                }));
+                            }
+                            normalizedMod.enable();
+                        }
+
+                        return;
+                    }
+
+                    load = bind(this, function (value) {
+                        this.init([], function () { return value; }, null, {
+                            enabled: true
+                        });
+                    });
+
+                    load.error = bind(this, function (err) {
+                        this.inited = true;
+                        this.error = err;
+                        err.requireModules = [id];
+
+                        //Remove temp unnormalized modules for this module,
+                        //since they will never be resolved otherwise now.
+                        eachProp(registry, function (mod) {
+                            if (mod.map.id.indexOf(id + '_unnormalized') === 0) {
+                                cleanRegistry(mod.map.id);
+                            }
+                        });
+
+                        onError(err);
+                    });
+
+                    //Allow plugins to load other code without having to know the
+                    //context or how to 'complete' the load.
+                    load.fromText = bind(this, function (text, textAlt) {
+                        /*jslint evil: true */
+                        var moduleName = map.name,
+                            moduleMap = makeModuleMap(moduleName),
+                            hasInteractive = useInteractive;
+
+                        //As of 2.1.0, support just passing the text, to reinforce
+                        //fromText only being called once per resource. Still
+                        //support old style of passing moduleName but discard
+                        //that moduleName in favor of the internal ref.
+                        if (textAlt) {
+                            text = textAlt;
+                        }
+
+                        //Turn off interactive script matching for IE for any define
+                        //calls in the text, then turn it back on at the end.
+                        if (hasInteractive) {
+                            useInteractive = false;
+                        }
+
+                        //Prime the system by creating a module instance for
+                        //it.
+                        getModule(moduleMap);
+
+                        //Transfer any config to this other module.
+                        if (hasProp(config.config, id)) {
+                            config.config[moduleName] = config.config[id];
+                        }
+
+                        try {
+                            req.exec(text);
+                        } catch (e) {
+                            return onError(makeError('fromtexteval',
+                                             'fromText eval for ' + id +
+                                            ' failed: ' + e,
+                                             e,
+                                             [id]));
+                        }
+
+                        if (hasInteractive) {
+                            useInteractive = true;
+                        }
+
+                        //Mark this as a dependency for the plugin
+                        //resource
+                        this.depMaps.push(moduleMap);
+
+                        //Support anonymous modules.
+                        context.completeLoad(moduleName);
+
+                        //Bind the value of that module to the value for this
+                        //resource ID.
+                        localRequire([moduleName], load);
+                    });
+
+                    //Use parentName here since the plugin's name is not reliable,
+                    //could be some weird string with no path that actually wants to
+                    //reference the parentName's path.
+                    plugin.load(map.name, localRequire, load, config);
+                }));
+
+                context.enable(pluginMap, this);
+                this.pluginMaps[pluginMap.id] = pluginMap;
+            },
+
+            enable: function () {
+                enabledRegistry[this.map.id] = this;
+                this.enabled = true;
+
+                //Set flag mentioning that the module is enabling,
+                //so that immediate calls to the defined callbacks
+                //for dependencies do not trigger inadvertent load
+                //with the depCount still being zero.
+                this.enabling = true;
+
+                //Enable each dependency
+                each(this.depMaps, bind(this, function (depMap, i) {
+                    var id, mod, handler;
+
+                    if (typeof depMap === 'string') {
+                        //Dependency needs to be converted to a depMap
+                        //and wired up to this module.
+                        depMap = makeModuleMap(depMap,
+                                               (this.map.isDefine ? this.map : this.map.parentMap),
+                                               false,
+                                               !this.skipMap);
+                        this.depMaps[i] = depMap;
+
+                        handler = getOwn(handlers, depMap.id);
+
+                        if (handler) {
+                            this.depExports[i] = handler(this);
+                            return;
+                        }
+
+                        this.depCount += 1;
+
+                        on(depMap, 'defined', bind(this, function (depExports) {
+                            this.defineDep(i, depExports);
+                            this.check();
+                        }));
+
+                        if (this.errback) {
+                            on(depMap, 'error', this.errback);
+                        }
+                    }
+
+                    id = depMap.id;
+                    mod = registry[id];
+
+                    //Skip special modules like 'require', 'exports', 'module'
+                    //Also, don't call enable if it is already enabled,
+                    //important in circular dependency cases.
+                    if (!hasProp(handlers, id) && mod && !mod.enabled) {
+                        context.enable(depMap, this);
+                    }
+                }));
+
+                //Enable each plugin that is used in
+                //a dependency
+                eachProp(this.pluginMaps, bind(this, function (pluginMap) {
+                    var mod = getOwn(registry, pluginMap.id);
+                    if (mod && !mod.enabled) {
+                        context.enable(pluginMap, this);
+                    }
+                }));
+
+                this.enabling = false;
+
+                this.check();
+            },
+
+            on: function (name, cb) {
+                var cbs = this.events[name];
+                if (!cbs) {
+                    cbs = this.events[name] = [];
+                }
+                cbs.push(cb);
+            },
+
+            emit: function (name, evt) {
+                each(this.events[name], function (cb) {
+                    cb(evt);
+                });
+                if (name === 'error') {
+                    //Now that the error handler was triggered, remove
+                    //the listeners, since this broken Module instance
+                    //can stay around for a while in the registry.
+                    delete this.events[name];
+                }
+            }
+        };
+
+        function callGetModule(args) {
+            //Skip modules already defined.
+            if (!hasProp(defined, args[0])) {
+                getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
+            }
+        }
+
+        function removeListener(node, func, name, ieName) {
+            //Favor detachEvent because of IE9
+            //issue, see attachEvent/addEventListener comment elsewhere
+            //in this file.
+            if (node.detachEvent && !isOpera) {
+                //Probably IE. If not it will throw an error, which will be
+                //useful to know.
+                if (ieName) {
+                    node.detachEvent(ieName, func);
+                }
+            } else {
+                node.removeEventListener(name, func, false);
+            }
+        }
+
+        /**
+         * Given an event from a script node, get the requirejs info from it,
+         * and then removes the event listeners on the node.
+         * @param {Event} evt
+         * @returns {Object}
+         */
+        function getScriptData(evt) {
+            //Using currentTarget instead of target for Firefox 2.0's sake. Not
+            //all old browsers will be supported, but this one was easy enough
+            //to support and still makes sense.
+            var node = evt.currentTarget || evt.srcElement;
+
+            //Remove the listeners once here.
+            removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange');
+            removeListener(node, context.onScriptError, 'error');
+
+            return {
+                node: node,
+                id: node && node.getAttribute('data-requiremodule')
+            };
+        }
+
+        function intakeDefines() {
+            var args;
+
+            //Any defined modules in the global queue, intake them now.
+            takeGlobalQueue();
+
+            //Make sure any remaining defQueue items get properly processed.
+            while (defQueue.length) {
+                args = defQueue.shift();
+                if (args[0] === null) {
+                    return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
+                } else {
+                    //args are id, deps, factory. Should be normalized by the
+                    //define() function.
+                    callGetModule(args);
+                }
+            }
+        }
+
+        context = {
+            config: config,
+            contextName: contextName,
+            registry: registry,
+            defined: defined,
+            urlFetched: urlFetched,
+            defQueue: defQueue,
+            Module: Module,
+            makeModuleMap: makeModuleMap,
+            nextTick: req.nextTick,
+            onError: onError,
+
+            /**
+             * Set a configuration for the context.
+             * @param {Object} cfg config object to integrate.
+             */
+            configure: function (cfg) {
+                //Make sure the baseUrl ends in a slash.
+                if (cfg.baseUrl) {
+                    if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') {
+                        cfg.baseUrl += '/';
+                    }
+                }
+
+                //Save off the paths and packages since they require special processing,
+                //they are additive.
+                var pkgs = config.pkgs,
+                    shim = config.shim,
+                    objs = {
+                        paths: true,
+                        config: true,
+                        map: true
+                    };
+
+                eachProp(cfg, function (value, prop) {
+                    if (objs[prop]) {
+                        if (prop === 'map') {
+                            if (!config.map) {
+                                config.map = {};
+                            }
+                            mixin(config[prop], value, true, true);
+                        } else {
+                            mixin(config[prop], value, true);
+                        }
+                    } else {
+                        config[prop] = value;
+                    }
+                });
+
+                //Merge shim
+                if (cfg.shim) {
+                    eachProp(cfg.shim, function (value, id) {
+                        //Normalize the structure
+                        if (isArray(value)) {
+                            value = {
+                                deps: value
+                            };
+                        }
+                        if ((value.exports || value.init) && !value.exportsFn) {
+                            value.exportsFn = context.makeShimExports(value);
+                        }
+                        shim[id] = value;
+                    });
+                    config.shim = shim;
+                }
+
+                //Adjust packages if necessary.
+                if (cfg.packages) {
+                    each(cfg.packages, function (pkgObj) {
+                        var location;
+
+                        pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
+                        location = pkgObj.location;
+
+                        //Create a brand new object on pkgs, since currentPackages can
+                        //be passed in again, and config.pkgs is the internal transformed
+                        //state for all package configs.
+                        pkgs[pkgObj.name] = {
+                            name: pkgObj.name,
+                            location: location || pkgObj.name,
+                            //Remove leading dot in main, so main paths are normalized,
+                            //and remove any trailing .js, since different package
+                            //envs have different conventions: some use a module name,
+                            //some use a file name.
+                            main: (pkgObj.main || 'main')
+                                  .replace(currDirRegExp, '')
+                                  .replace(jsSuffixRegExp, '')
+                        };
+                    });
+
+                    //Done with modifications, assing packages back to context config
+                    config.pkgs = pkgs;
+                }
+
+                //If there are any "waiting to execute" modules in the registry,
+                //update the maps for them, since their info, like URLs to load,
+                //may have changed.
+                eachProp(registry, function (mod, id) {
+                    //If module already has init called, since it is too
+                    //late to modify them, and ignore unnormalized ones
+                    //since they are transient.
+                    if (!mod.inited && !mod.map.unnormalized) {
+                        mod.map = makeModuleMap(id);
+                    }
+                });
+
+                //If a deps array or a config callback is specified, then call
+                //require with those args. This is useful when require is defined as a
+                //config object before require.js is loaded.
+                if (cfg.deps || cfg.callback) {
+                    context.require(cfg.deps || [], cfg.callback);
+                }
+            },
+
+            makeShimExports: function (value) {
+                function fn() {
+                    var ret;
+                    if (value.init) {
+                        ret = value.init.apply(global, arguments);
+                    }
+                    return ret || (value.exports && getGlobal(value.exports));
+                }
+                return fn;
+            },
+
+            makeRequire: function (relMap, options) {
+                options = options || {};
+
+                function localRequire(deps, callback, errback) {
+                    var id, map, requireMod;
+
+                    if (options.enableBuildCallback && callback && isFunction(callback)) {
+                        callback.__requireJsBuild = true;
+                    }
+
+                    if (typeof deps === 'string') {
+                        if (isFunction(callback)) {
+                            //Invalid call
+                            return onError(makeError('requireargs', 'Invalid require call'), errback);
+                        }
+
+                        //If require|exports|module are requested, get the
+                        //value for them from the special handlers. Caveat:
+                        //this only works while module is being defined.
+                        if (relMap && hasProp(handlers, deps)) {
+                            return handlers[deps](registry[relMap.id]);
+                        }
+
+                        //Synchronous access to one module. If require.get is
+                        //available (as in the Node adapter), prefer that.
+                        if (req.get) {
+                            return req.get(context, deps, relMap, localRequire);
+                        }
+
+                        //Normalize module name, if it contains . or ..
+                        map = makeModuleMap(deps, relMap, false, true);
+                        id = map.id;
+
+                        if (!hasProp(defined, id)) {
+                            return onError(makeError('notloaded', 'Module name "' +
+                                        id +
+                                        '" has not been loaded yet for context: ' +
+                                        contextName +
+                                        (relMap ? '' : '. Use require([])')));
+                        }
+                        return defined[id];
+                    }
+
+                    //Grab defines waiting in the global queue.
+                    intakeDefines();
+
+                    //Mark all the dependencies as needing to be loaded.
+                    context.nextTick(function () {
+                        //Some defines could have been added since the
+                        //require call, collect them.
+                        intakeDefines();
+
+                        requireMod = getModule(makeModuleMap(null, relMap));
+
+                        //Store if map config should be applied to this require
+                        //call for dependencies.
+                        requireMod.skipMap = options.skipMap;
+
+                        requireMod.init(deps, callback, errback, {
+                            enabled: true
+                        });
+
+                        checkLoaded();
+                    });
+
+                    return localRequire;
+                }
+
+                mixin(localRequire, {
+                    isBrowser: isBrowser,
+
+                    /**
+                     * Converts a module name + .extension into an URL path.
+                     * *Requires* the use of a module name. It does not support using
+                     * plain URLs like nameToUrl.
+                     */
+                    toUrl: function (moduleNamePlusExt) {
+                        var ext,
+                            index = moduleNamePlusExt.lastIndexOf('.'),
+                            segment = moduleNamePlusExt.split('/')[0],
+                            isRelative = segment === '.' || segment === '..';
+
+                        //Have a file extension alias, and it is not the
+                        //dots from a relative path.
+                        if (index !== -1 && (!isRelative || index > 1)) {
+                            ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
+                            moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
+                        }
+
+                        return context.nameToUrl(normalize(moduleNamePlusExt,
+                                                relMap && relMap.id, true), ext,  true);
+                    },
+
+                    defined: function (id) {
+                        return hasProp(defined, makeModuleMap(id, relMap, false, true).id);
+                    },
+
+                    specified: function (id) {
+                        id = makeModuleMap(id, relMap, false, true).id;
+                        return hasProp(defined, id) || hasProp(registry, id);
+                    }
+                });
+
+                //Only allow undef on top level require calls
+                if (!relMap) {
+                    localRequire.undef = function (id) {
+                        //Bind any waiting define() calls to this context,
+                        //fix for #408
+                        takeGlobalQueue();
+
+                        var map = makeModuleMap(id, relMap, true),
+                            mod = getOwn(registry, id);
+
+                        delete defined[id];
+                        delete urlFetched[map.url];
+                        delete undefEvents[id];
+
+                        if (mod) {
+                            //Hold on to listeners in case the
+                            //module will be attempted to be reloaded
+                            //using a different config.
+                            if (mod.events.defined) {
+                                undefEvents[id] = mod.events;
+                            }
+
+                            cleanRegistry(id);
+                        }
+                    };
+                }
+
+                return localRequire;
+            },
+
+            /**
+             * Called to enable a module if it is still in the registry
+             * awaiting enablement. A second arg, parent, the parent module,
+             * is passed in for context, when this method is overriden by
+             * the optimizer. Not shown here to keep code compact.
+             */
+            enable: function (depMap) {
+                var mod = getOwn(registry, depMap.id);
+                if (mod) {
+                    getModule(depMap).enable();
+                }
+            },
+
+            /**
+             * Internal method used by environment adapters to complete a load event.
+             * A load event could be a script load or just a load pass from a synchronous
+             * load call.
+             * @param {String} moduleName the name of the module to potentially complete.
+             */
+            completeLoad: function (moduleName) {
+                var found, args, mod,
+                    shim = getOwn(config.shim, moduleName) || {},
+                    shExports = shim.exports;
+
+                takeGlobalQueue();
+
+                while (defQueue.length) {
+                    args = defQueue.shift();
+                    if (args[0] === null) {
+                        args[0] = moduleName;
+                        //If already found an anonymous module and bound it
+                        //to this name, then this is some other anon module
+                        //waiting for its completeLoad to fire.
+                        if (found) {
+                            break;
+                        }
+                        found = true;
+                    } else if (args[0] === moduleName) {
+                        //Found matching define call for this script!
+                        found = true;
+                    }
+
+                    callGetModule(args);
+                }
+
+                //Do this after the cycle of callGetModule in case the result
+                //of those calls/init calls changes the registry.
+                mod = getOwn(registry, moduleName);
+
+                if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) {
+                    if (config.enforceDefine && (!shExports || !getGlobal(shExports))) {
+                        if (hasPathFallback(moduleName)) {
+                            return;
+                        } else {
+                            return onError(makeError('nodefine',
+                                             'No define call for ' + moduleName,
+                                             null,
+                                             [moduleName]));
+                        }
+                    } else {
+                        //A script that does not call define(), so just simulate
+                        //the call for it.
+                        callGetModule([moduleName, (shim.deps || []), shim.exportsFn]);
+                    }
+                }
+
+                checkLoaded();
+            },
+
+            /**
+             * Converts a module name to a file path. Supports cases where
+             * moduleName may actually be just an URL.
+             * Note that it **does not** call normalize on the moduleName,
+             * it is assumed to have already been normalized. This is an
+             * internal API, not a public one. Use toUrl for the public API.
+             */
+            nameToUrl: function (moduleName, ext, skipExt) {
+                var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url,
+                    parentPath;
+
+                //If a colon is in the URL, it indicates a protocol is used and it is just
+                //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?)
+                //or ends with .js, then assume the user meant to use an url and not a module id.
+                //The slash is important for protocol-less URLs as well as full paths.
+                if (req.jsExtRegExp.test(moduleName)) {
+                    //Just a plain path, not module name lookup, so just return it.
+                    //Add extension if it is included. This is a bit wonky, only non-.js things pass
+                    //an extension, this method probably needs to be reworked.
+                    url = moduleName + (ext || '');
+                } else {
+                    //A module that needs to be converted to a path.
+                    paths = config.paths;
+                    pkgs = config.pkgs;
+
+                    syms = moduleName.split('/');
+                    //For each module name segment, see if there is a path
+                    //registered for it. Start with most specific name
+                    //and work up from it.
+                    for (i = syms.length; i > 0; i -= 1) {
+                        parentModule = syms.slice(0, i).join('/');
+                        pkg = getOwn(pkgs, parentModule);
+                        parentPath = getOwn(paths, parentModule);
+                        if (parentPath) {
+                            //If an array, it means there are a few choices,
+                            //Choose the one that is desired
+                            if (isArray(parentPath)) {
+                                parentPath = parentPath[0];
+                            }
+                            syms.splice(0, i, parentPath);
+                            break;
+                        } else if (pkg) {
+                            //If module name is just the package name, then looking
+                            //for the main module.
+                            if (moduleName === pkg.name) {
+                                pkgPath = pkg.location + '/' + pkg.main;
+                            } else {
+                                pkgPath = pkg.location;
+                            }
+                            syms.splice(0, i, pkgPath);
+                            break;
+                        }
+                    }
+
+                    //Join the path parts together, then figure out if baseUrl is needed.
+                    url = syms.join('/');
+                    url += (ext || (/\?/.test(url) || skipExt ? '' : '.js'));
+                    url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
+                }
+
+                return config.urlArgs ? url +
+                                        ((url.indexOf('?') === -1 ? '?' : '&') +
+                                         config.urlArgs) : url;
+            },
+
+            //Delegates to req.load. Broken out as a separate function to
+            //allow overriding in the optimizer.
+            load: function (id, url) {
+                req.load(context, id, url);
+            },
+
+            /**
+             * Executes a module callack function. Broken out as a separate function
+             * solely to allow the build system to sequence the files in the built
+             * layer in the right sequence.
+             *
+             * @private
+             */
+            execCb: function (name, callback, args, exports) {
+                return callback.apply(exports, args);
+            },
+
+            /**
+             * callback for script loads, used to check status of loading.
+             *
+             * @param {Event} evt the event from the browser for the script
+             * that was loaded.
+             */
+            onScriptLoad: function (evt) {
+                //Using currentTarget instead of target for Firefox 2.0's sake. Not
+                //all old browsers will be supported, but this one was easy enough
+                //to support and still makes sense.
+                if (evt.type === 'load' ||
+                        (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) {
+                    //Reset interactive script so a script node is not held onto for
+                    //to long.
+                    interactiveScript = null;
+
+                    //Pull out the name of the module and the context.
+                    var data = getScriptData(evt);
+                    context.completeLoad(data.id);
+                }
+            },
+
+            /**
+             * Callback for script errors.
+             */
+            onScriptError: function (evt) {
+                var data = getScriptData(evt);
+                if (!hasPathFallback(data.id)) {
+                    return onError(makeError('scripterror', 'Script error', evt, [data.id]));
+                }
+            }
+        };
+
+        context.require = context.makeRequire();
+        return context;
+    }
+
+    /**
+     * Main entry point.
+     *
+     * If the only argument to require is a string, then the module that
+     * is represented by that string is fetched for the appropriate context.
+     *
+     * If the first argument is an array, then it will be treated as an array
+     * of dependency string names to fetch. An optional function callback can
+     * be specified to execute when all of those dependencies are available.
+     *
+     * Make a local req variable to help Caja compliance (it assumes things
+     * on a require that are not standardized), and to give a short
+     * name for minification/local scope use.
+     */
+    req = requirejs = function (deps, callback, errback, optional) {
+
+        //Find the right context, use default
+        var context, config,
+            contextName = defContextName;
+
+        // Determine if have config object in the call.
+        if (!isArray(deps) && typeof deps !== 'string') {
+            // deps is a config object
+            config = deps;
+            if (isArray(callback)) {
+                // Adjust args if there are dependencies
+                deps = callback;
+                callback = errback;
+                errback = optional;
+            } else {
+                deps = [];
+            }
+        }
+
+        if (config && config.context) {
+            contextName = config.context;
+        }
+
+        context = getOwn(contexts, contextName);
+        if (!context) {
+            context = contexts[contextName] = req.s.newContext(contextName);
+        }
+
+        if (config) {
+            context.configure(config);
+        }
+
+        return context.require(deps, callback, errback);
+    };
+
+    /**
+     * Support require.config() to make it easier to cooperate with other
+     * AMD loaders on globally agreed names.
+     */
+    req.config = function (config) {
+        return req(config);
+    };
+
+    /**
+     * Execute something after the current tick
+     * of the event loop. Override for other envs
+     * that have a better solution than setTimeout.
+     * @param  {Function} fn function to execute later.
+     */
+    req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) {
+        setTimeout(fn, 4);
+    } : function (fn) { fn(); };
+
+    /**
+     * Export require as a global, but only if it does not already exist.
+     */
+    if (!require) {
+        require = req;
+    }
+
+    req.version = version;
+
+    //Used to filter out dependencies that are already paths.
+    req.jsExtRegExp = /^\/|:|\?|\.js$/;
+    req.isBrowser = isBrowser;
+    s = req.s = {
+        contexts: contexts,
+        newContext: newContext
+    };
+
+    //Create default context.
+    req({});
+
+    //Exports some context-sensitive methods on global require.
+    each([
+        'toUrl',
+        'undef',
+        'defined',
+        'specified'
+    ], function (prop) {
+        //Reference from contexts instead of early binding to default context,
+        //so that during builds, the latest instance of the default context
+        //with its config gets used.
+        req[prop] = function () {
+            var ctx = contexts[defContextName];
+            return ctx.require[prop].apply(ctx, arguments);
+        };
+    });
+
+    if (isBrowser) {
+        head = s.head = document.getElementsByTagName('head')[0];
+        //If BASE tag is in play, using appendChild is a problem for IE6.
+        //When that browser dies, this can be removed. Details in this jQuery bug:
+        //http://dev.jquery.com/ticket/2709
+        baseElement = document.getElementsByTagName('base')[0];
+        if (baseElement) {
+            head = s.head = baseElement.parentNode;
+        }
+    }
+
+    /**
+     * Any errors that require explicitly generates will be passed to this
+     * function. Intercept/override it if you want custom error handling.
+     * @param {Error} err the error object.
+     */
+    req.onError = function (err) {
+        throw err;
+    };
+
+    /**
+     * Does the request to load a module for the browser case.
+     * Make this a separate function to allow other environments
+     * to override it.
+     *
+     * @param {Object} context the require context to find state.
+     * @param {String} moduleName the name of the module.
+     * @param {Object} url the URL to the module.
+     */
+    req.load = function (context, moduleName, url) {
+        var config = (context && context.config) || {},
+            node;
+        if (isBrowser) {
+            //In the browser so use a script tag
+            node = config.xhtml ?
+                    document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
+                    document.createElement('script');
+            node.type = config.scriptType || 'text/javascript';
+            node.charset = 'utf-8';
+            node.async = true;
+
+            node.setAttribute('data-requirecontext', context.contextName);
+            node.setAttribute('data-requiremodule', moduleName);
+
+            //Set up load listener. Test attachEvent first because IE9 has
+            //a subtle issue in its addEventListener and script onload firings
+            //that do not match the behavior of all other browsers with
+            //addEventListener support, which fire the onload event for a
+            //script right after the script execution. See:
+            //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution
+            //UNFORTUNATELY Opera implements attachEvent but does not follow the script
+            //script execution mode.
+            if (node.attachEvent &&
+                    //Check if node.attachEvent is artificially added by custom script or
+                    //natively supported by browser
+                    //read https://github.com/jrburke/requirejs/issues/187
+                    //if we can NOT find [native code] then it must NOT natively supported.
+                    //in IE8, node.attachEvent does not have toString()
+                    //Note the test for "[native code" with no closing brace, see:
+                    //https://github.com/jrburke/requirejs/issues/273
+                    !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) &&
+                    !isOpera) {
+                //Probably IE. IE (at least 6-8) do not fire
+                //script onload right after executing the script, so
+                //we cannot tie the anonymous define call to a name.
+                //However, IE reports the script as being in 'interactive'
+                //readyState at the time of the define call.
+                useInteractive = true;
+
+                node.attachEvent('onreadystatechange', context.onScriptLoad);
+                //It would be great to add an error handler here to catch
+                //404s in IE9+. However, onreadystatechange will fire before
+                //the error handler, so that does not help. If addEventListener
+                //is used, then IE will fire error before load, but we cannot
+                //use that pathway given the connect.microsoft.com issue
+                //mentioned above about not doing the 'script execute,
+                //then fire the script load event listener before execute
+                //next script' that other browsers do.
+                //Best hope: IE10 fixes the issues,
+                //and then destroys all installs of IE 6-9.
+                //node.attachEvent('onerror', context.onScriptError);
+            } else {
+                node.addEventListener('load', context.onScriptLoad, false);
+                node.addEventListener('error', context.onScriptError, false);
+            }
+            node.src = url;
+
+            //For some cache cases in IE 6-8, the script executes before the end
+            //of the appendChild execution, so to tie an anonymous define
+            //call to the module name (which is stored on the node), hold on
+            //to a reference to this node, but clear after the DOM insertion.
+            currentlyAddingScript = node;
+            if (baseElement) {
+                head.insertBefore(node, baseElement);
+            } else {
+                head.appendChild(node);
+            }
+            currentlyAddingScript = null;
+
+            return node;
+        } else if (isWebWorker) {
+            try {
+                //In a web worker, use importScripts. This is not a very
+                //efficient use of importScripts, importScripts will block until
+                //its script is downloaded and evaluated. However, if web workers
+                //are in play, the expectation that a build has been done so that
+                //only one script needs to be loaded anyway. This may need to be
+                //reevaluated if other use cases become common.
+                importScripts(url);
+
+                //Account for anonymous modules
+                context.completeLoad(moduleName);
+            } catch (e) {
+                context.onError(makeError('importscripts',
+                                'importScripts failed for ' +
+                                    moduleName + ' at ' + url,
+                                e,
+                                [moduleName]));
+            }
+        }
+    };
+
+    function getInteractiveScript() {
+        if (interactiveScript && interactiveScript.readyState === 'interactive') {
+            return interactiveScript;
+        }
+
+        eachReverse(scripts(), function (script) {
+            if (script.readyState === 'interactive') {
+                return (interactiveScript = script);
+            }
+        });
+        return interactiveScript;
+    }
+
+    //Look for a data-main script attribute, which could also adjust the baseUrl.
+    if (isBrowser) {
+        //Figure out baseUrl. Get it from the script tag with require.js in it.
+        eachReverse(scripts(), function (script) {
+            //Set the 'head' where we can append children by
+            //using the script's parent.
+            if (!head) {
+                head = script.parentNode;
+            }
+
+            //Look for a data-main attribute to set main script for the page
+            //to load. If it is there, the path to data main becomes the
+            //baseUrl, if it is not already set.
+            dataMain = script.getAttribute('data-main');
+            if (dataMain) {
+                //Set final baseUrl if there is not already an explicit one.
+                if (!cfg.baseUrl) {
+                    //Pull off the directory of data-main for use as the
+                    //baseUrl.
+                    src = dataMain.split('/');
+                    mainScript = src.pop();
+                    subPath = src.length ? src.join('/')  + '/' : './';
+
+                    cfg.baseUrl = subPath;
+                    dataMain = mainScript;
+                }
+
+                //Strip off any trailing .js since dataMain is now
+                //like a module name.
+                dataMain = dataMain.replace(jsSuffixRegExp, '');
+
+                //Put the data-main script in the files to load.
+                cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain];
+
+                return true;
+            }
+        });
+    }
+
+    /**
+     * The function that handles definitions of modules. Differs from
+     * require() in that a string for the module should be the first argument,
+     * and the function to execute after dependencies are loaded should
+     * return a value to define the module corresponding to the first argument's
+     * name.
+     */
+    define = function (name, deps, callback) {
+        var node, context;
+
+        //Allow for anonymous modules
+        if (typeof name !== 'string') {
+            //Adjust args appropriately
+            callback = deps;
+            deps = name;
+            name = null;
+        }
+
+        //This module may not have dependencies
+        if (!isArray(deps)) {
+            callback = deps;
+            deps = [];
+        }
+
+        //If no name, and callback is a function, then figure out if it a
+        //CommonJS thing with dependencies.
+        if (!deps.length && isFunction(callback)) {
+            //Remove comments from the callback string,
+            //look for require calls, and pull them into the dependencies,
+            //but only if there are function args.
+            if (callback.length) {
+                callback
+                    .toString()
+                    .replace(commentRegExp, '')
+                    .replace(cjsRequireRegExp, function (match, dep) {
+                        deps.push(dep);
+                    });
+
+                //May be a CommonJS thing even without require calls, but still
+                //could use exports, and module. Avoid doing exports and module
+                //work though if it just needs require.
+                //REQUIRES the function to expect the CommonJS variables in the
+                //order listed below.
+                deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps);
+            }
+        }
+
+        //If in IE 6-8 and hit an anonymous define() call, do the interactive
+        //work.
+        if (useInteractive) {
+            node = currentlyAddingScript || getInteractiveScript();
+            if (node) {
+                if (!name) {
+                    name = node.getAttribute('data-requiremodule');
+                }
+                context = contexts[node.getAttribute('data-requirecontext')];
+            }
+        }
+
+        //Always save off evaluating the def call until the script onload handler.
+        //This allows multiple modules to be in a file without prematurely
+        //tracing dependencies, and allows for anonymous module support,
+        //where the module name is not known until the script onload event
+        //occurs. If no context, use the global queue, and get it processed
+        //in the onscript load callback.
+        (context ? context.defQueue : globalDefQueue).push([name, deps, callback]);
+    };
+
+    define.amd = {
+        jQuery: true
+    };
+
+
+    /**
+     * Executes the text. Normally just uses eval, but can be modified
+     * to use a better, environment-specific call. Only used for transpiling
+     * loader plugins, not for plain JS modules.
+     * @param {String} text the text to execute/evaluate.
+     */
+    req.exec = function (text) {
+        /*jslint evil: true */
+        return eval(text);
+    };
+
+    //Set up with config info.
+    req(cfg);
+}(this));
diff --git a/js/synchronizer.js b/js/synchronizer.js
index 17c1d514..f6f573cd 100644
--- a/js/synchronizer.js
+++ b/js/synchronizer.js
@@ -1,24 +1,20 @@
-var SYNC_PERIOD = 60000;
-var SYNC_PROVIDER_GDRIVE = "sync.gdrive.";
-var syncGoogleDrive = false;
-
-var synchronizer = (function() {
+define(["jquery", "core", "file-manager", "gdrive"], function($, core, fileManager, gdrive) {
 	var synchronizer = {};
 	
+	// Used to know the providers we are connected to 
+	synchronizer.useGoogleDrive = false;
+	
 	var onSyncBegin = undefined;
 	var onSyncEnd = undefined;
 	var onQueueChanged = undefined;
 
-	var doNothing = function() {
-	};
-	
 	// A synchronization queue containing fileIndex that has to be synchronized
 	var syncUpQueue = undefined;
 	
 	synchronizer.init = function(options) {
-		onSyncBegin = options.onSyncBegin || doNothing;
-		onSyncEnd = options.onSyncEnd || doNothing;
-		onQueueChanged = options.onQueueChanged || doNothing;
+		onSyncBegin = options.onSyncBegin || core.doNothing;
+		onSyncEnd = options.onSyncEnd || core.doNothing;
+		onQueueChanged = options.onQueueChanged || core.doNothing;
 		
 		syncUpQueue = ";";
 		// Load the queue from localStorage in case a previous synchronization
@@ -61,7 +57,7 @@ var synchronizer = (function() {
 		if (fileSyncIndex.indexOf(SYNC_PROVIDER_GDRIVE) === 0) {
 			var id = fileSyncIndex.substring(SYNC_PROVIDER_GDRIVE.length);
 			gdrive.updateFile(id, title, content, function(result) {
-				if (result === undefined && offline === true) {
+				if (result === undefined && core.isOffline === true) {
 					// If we detect offline mode we put the fileIndex back in
 					// the queue
 					synchronizer.addFileForUpload(localStorage["sync.current"]);
@@ -100,7 +96,7 @@ var synchronizer = (function() {
 	};
 
 	function syncDownGdrive(callback) {
-		if (syncGoogleDrive === false) {
+		if (synchronizer.useGoogleDrive === false) {
 			callback();
 			return;
 		}
@@ -132,7 +128,7 @@ var synchronizer = (function() {
 					if (change.deleted === true) {
 						fileManager.removeSync(fileSyncIndex);
 						updateFileTitles = true;
-						showMessage('"' + title + '" has been removed from Google Drive.');
+						core.showMessage('"' + title + '" has been removed from Google Drive.');
 						continue;
 					}
 					var content = localStorage[fileIndex + ".content"];
@@ -143,18 +139,18 @@ var synchronizer = (function() {
 					if ((titleChanged || contentChanged) && syncUpQueue.indexOf(";" + fileIndex + ";") !== -1) {
 						fileManager.createFile(title + " (backup)", content);
 						updateFileTitles = true;
-						showMessage('Conflict detected on "' + title + '". A backup has been created locally.');
+						core.showMessage('Conflict detected on "' + title + '". A backup has been created locally.');
 					}
 					// If file title changed
 					if(titleChanged) {
 						localStorage[fileIndex + ".title"] = file.title;
 						updateFileTitles = true;
-						showMessage('"' + title + '" has been renamed to "' + file.title + '" on Google Drive.');
+						core.showMessage('"' + title + '" has been renamed to "' + file.title + '" on Google Drive.');
 					}
 					// If file content changed
 					if(contentChanged) {
 						localStorage[fileIndex + ".content"] = file.content;
-						showMessage('"' + file.title + '" has been updated from Google Drive.');
+						core.showMessage('"' + file.title + '" has been updated from Google Drive.');
 						if(fileIndex == localStorage["file.current"]) {
 							updateFileTitles = false; // Done by next function
 							fileManager.selectFile();
@@ -183,11 +179,11 @@ var synchronizer = (function() {
 	var lastSync = 0;
 	synchronizer.sync = function() {
 		// If sync is already running or timeout is not reached or offline
-		if (syncRunning || lastSync + SYNC_PERIOD > currentTime || offline) {
+		if (syncRunning || lastSync + SYNC_PERIOD > core.currentTime || core.isOffline) {
 			return;
 		}
 		syncRunning = true;
-		lastSync = currentTime;
+		lastSync = core.currentTime;
 		onSyncBegin();
 
 		syncDown(function() {
@@ -212,4 +208,4 @@ var synchronizer = (function() {
 	};
 	
 	return synchronizer;
-})();
+});