diff --git a/index.html b/index.html
index e8aa05d9..73297356 100644
--- a/index.html
+++ b/index.html
@@ -4,23 +4,23 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 		<title>TurtleStitch 2.0</title>
 		<link rel="shortcut icon" href="stitchcode/favicon-32x32.png" type="image/png" />
-		<script type="text/javascript" src="morphic.js"></script>
-		<script type="text/javascript" src="widgets.js"></script>
-		<script type="text/javascript" src="blocks.js"></script>
-		<script type="text/javascript" src="threads.js"></script>
-		<script type="text/javascript" src="objects.js"></script>
-		<script type="text/javascript" src="gui.js"></script>
-		<script type="text/javascript" src="paint.js"></script>
-		<script type="text/javascript" src="lists.js"></script>
-		<script type="text/javascript" src="byob.js"></script>
-		<script type="text/javascript" src="tables.js"></script>
-		<script type="text/javascript" src="symbols.js"></script>
-		<script type="text/javascript" src="xml.js"></script>
-		<script type="text/javascript" src="store.js"></script>
-		<script type="text/javascript" src="locale.js"></script>
-		<script type="text/javascript" src="cloud.js"></script>
-		<script type="text/javascript" src="sha512.js"></script>
-		<script type="text/javascript" src="FileSaver.min.js"></script>
+		<script type="text/javascript" src="src/morphic.js"></script>
+		<script type="text/javascript" src="src/widgets.js"></script>
+		<script type="text/javascript" src="src/blocks.js"></script>
+		<script type="text/javascript" src="src/threads.js"></script>
+		<script type="text/javascript" src="src/objects.js"></script>
+		<script type="text/javascript" src="src/gui.js"></script>
+		<script type="text/javascript" src="src/paint.js"></script>
+		<script type="text/javascript" src="src/lists.js"></script>
+		<script type="text/javascript" src="src/byob.js"></script>
+		<script type="text/javascript" src="src/tables.js"></script>
+		<script type="text/javascript" src="src/symbols.js"></script>
+		<script type="text/javascript" src="src/xml.js"></script>
+		<script type="text/javascript" src="src/store.js"></script>
+		<script type="text/javascript" src="src/locale.js"></script>
+		<script type="text/javascript" src="src/cloud.js"></script>
+		<script type="text/javascript" src="src/sha512.js"></script>
+		<script type="text/javascript" src="src/FileSaver.min.js"></script>
 
 		<script type="text/javascript" src="stitchcode/three-newer/three.js"></script>
 		<script type="text/javascript" src="stitchcode/threee/CanvasRenderer.js"></script>
diff --git a/stitchcode/gui.js b/stitchcode/gui.js
index 6d776943..91e41aad 100644
--- a/stitchcode/gui.js
+++ b/stitchcode/gui.js
@@ -1588,16 +1588,26 @@ IDE_Morph.prototype.projectMenu = function () {
     menu.addItem(
         'Import tools',
         function () {
-            myself.droppedText(
-                myself.getURL(myself.resourceURL('tools.xml')),
-                'tools'
+            if (location.protocol === 'file:') {
+                myself.importLocalFile();
+                return;
+            }
+            myself.getURL(
+                myself.resourceURL('libraries', 'tools.xml'),
+                function (txt) {
+                    myself.droppedText(txt, 'tools');
+                }
             );
         },
         'load the official library of\npowerful blocks'
     );
-    menu.addItem(
+	menu.addItem(
         'Libraries...',
         function() {
+            if (location.protocol === 'file:') {
+                myself.importLocalFile();
+                return;
+            }
             myself.getURL(
                 myself.resourceURL('libraries', 'LIBRARIES'),
                 function (txt) {