diff --git a/scripts/default/attachedEntitiesManager.js b/scripts/default/attachedEntitiesManager.js
index ef85f8cb98..9ddb040297 100644
--- a/scripts/default/attachedEntitiesManager.js
+++ b/scripts/default/attachedEntitiesManager.js
@@ -27,7 +27,6 @@ var SHOW_TOOL_BAR = false;
 // tool bar
 
 if (SHOW_TOOL_BAR) {
-    HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
     var BUTTON_SIZE = 32;
     var PADDING = 3;
     Script.include(["libraries/toolBars.js"]);
diff --git a/scripts/default/away.js b/scripts/default/away.js
index 9c5aed98fa..2880bdcb04 100644
--- a/scripts/default/away.js
+++ b/scripts/default/away.js
@@ -269,4 +269,4 @@ Script.scriptEnding.connect(function () {
     Controller.disableMapping(eventMappingName);
     Controller.mousePressEvent.disconnect(goActive);
     Controller.keyPressEvent.disconnect(maybeGoActive);
-});
+});
\ No newline at end of file
diff --git a/scripts/default/controllers/grab.js b/scripts/default/controllers/grab.js
index f9d1f41b97..fcc7a6d291 100644
--- a/scripts/default/controllers/grab.js
+++ b/scripts/default/controllers/grab.js
@@ -11,7 +11,7 @@
 //
 /*global print, Mouse, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt, pointInExtents, vec3equal, setEntityCustomData, getEntityCustomData */
 
-Script.include("libraries/utils.js");
+Script.include("../libraries/utils.js");
 // objects that appear smaller than this can't be grabbed
 var MAX_SOLID_ANGLE = 0.01;
 
diff --git a/scripts/default/controllers/handControllerGrab.js b/scripts/default/controllers/handControllerGrab.js
index 4b20651899..5924d566b4 100644
--- a/scripts/default/controllers/handControllerGrab.js
+++ b/scripts/default/controllers/handControllerGrab.js
@@ -12,7 +12,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 /*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt, pointInExtents, vec3equal, setEntityCustomData, getEntityCustomData */
 
-Script.include("/~/libraries/utils.js");
+Script.include("../libraries/utils.js");
 
 
 //
diff --git a/scripts/default/defaultScripts.js b/scripts/default/defaultScripts.js
index a4c8c36169..84f0c05aeb 100644
--- a/scripts/default/defaultScripts.js
+++ b/scripts/default/defaultScripts.js
@@ -16,7 +16,8 @@ Script.load("selectAudioDevice.js");
 Script.load("notifications.js");
 Script.load("controllers/handControllerGrab.js");
 Script.load("controllers/squeezeHands.js");
-Script.load("grab.js");
+Script.load("controllers/grab.js");
 Script.load("directory.js");
 Script.load("dialTone.js");
+// Script.load("attachedEntitiesManager.js");
 Script.load("depthReticle.js");
diff --git a/scripts/default/dialTone.js b/scripts/default/dialTone.js
index eb1fc5ec1c..64ef62d61a 100644
--- a/scripts/default/dialTone.js
+++ b/scripts/default/dialTone.js
@@ -11,9 +11,11 @@
 //
 
 // setup the local sound we're going to use
-var connectSound = SoundCache.getSound("file:///" + Paths.resources + "sounds/hello.wav");
-var disconnectSound = SoundCache.getSound("file:///" + Paths.resources + "sounds/goodbye.wav");
-var micMutedSound = SoundCache.getSound("file:///" + Paths.resources + "sounds/goodbye.wav");
+
+
+var connectSound = SoundCache.getSound(Script.resolvePath("assets/sounds/hello.wav"));
+var disconnectSound = SoundCache.getSound(Script.resolvePath("assets/sounds/goodbye.wav"));
+var micMutedSound = SoundCache.getSound(Script.resolvePath("assets/sounds/goodbye.wav"));
 
 // setup the options needed for that sound
 var soundOptions = {
diff --git a/scripts/default/directory.js b/scripts/default/directory.js
index 243811c8d4..1df982541c 100644
--- a/scripts/default/directory.js
+++ b/scripts/default/directory.js
@@ -13,8 +13,7 @@ Script.include([
     "libraries/toolBars.js",
 ]);
 
-HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
-var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
+var toolIconUrl = Script.resolvePath("assets/images/tools/");
 
 var DIRECTORY_WINDOW_URL = "https://metaverse.highfidelity.com/directory";
 var directoryWindow = new OverlayWebWindow({
diff --git a/scripts/default/edit.js b/scripts/default/edit.js
index f03915f5ad..6784c41100 100644
--- a/scripts/default/edit.js
+++ b/scripts/default/edit.js
@@ -50,7 +50,7 @@ selectionManager.addEventListener(function() {
     lightOverlayManager.updatePositions();
 }); 
 
-var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
+var toolIconUrl = Script.resolvePath("assets/images/tools/");
 var toolHeight = 50;
 var toolWidth = 50;
 
@@ -105,7 +105,7 @@ IMPORTING_SVO_OVERLAY_HEIGHT = 30;
 IMPORTING_SVO_OVERLAY_MARGIN = 5;
 IMPORTING_SVO_OVERLAY_LEFT_MARGIN = 34;
 var importingSVOImageOverlay = Overlays.addOverlay("image", {
-    imageURL: HIFI_PUBLIC_BUCKET + "images/hourglass.svg",
+    imageURL: Script.resolvePath("assets") + "/images/hourglass.svg",
     width: 20,
     height: 20,
     alpha: 1.0,
@@ -187,7 +187,7 @@ var toolBar = (function() {
         });
 
         activeButton = toolBar.addTool({
-            imageURL: toolIconUrl + "edit-01.svg",
+            imageURL:  toolIconUrl + "edit-01.svg",
             subImage: {
                 x: 0,
                 y: Tool.IMAGE_WIDTH,
@@ -201,7 +201,7 @@ var toolBar = (function() {
         }, true, false);
 
         newModelButton = toolBar.addTool({
-            imageURL: toolIconUrl + "model-01.svg",
+            imageURL:toolIconUrl + "model-01.svg",
             subImage: {
                 x: 0,
                 y: Tool.IMAGE_WIDTH,
@@ -216,7 +216,7 @@ var toolBar = (function() {
         });
 
         newCubeButton = toolBar.addTool({
-            imageURL: toolIconUrl + "cube-01.svg",
+            imageURL:toolIconUrl + "cube-01.svg",
             subImage: {
                 x: 0,
                 y: Tool.IMAGE_WIDTH,
diff --git a/scripts/default/examples.js b/scripts/default/examples.js
index bfa85473de..9883de2582 100644
--- a/scripts/default/examples.js
+++ b/scripts/default/examples.js
@@ -13,8 +13,7 @@ Script.include([
     "libraries/toolBars.js",
 ]);
 
-HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
-var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
+var toolIconUrl = Script.resolvePath("assets/images/tools/");
 
 var EXAMPLES_URL = "https://metaverse.highfidelity.com/examples";
 var examplesWindow = new OverlayWebWindow({
@@ -132,4 +131,4 @@ var toolBar = (function() {
 }());
 
 Controller.mousePressEvent.connect(toolBar.mousePressEvent)
-Script.scriptEnding.connect(toolBar.cleanup);
+Script.scriptEnding.connect(toolBar.cleanup);
\ No newline at end of file
diff --git a/scripts/default/html/edit-style.css b/scripts/default/html/edit-style.css
index de6f6a670d..5eaa3c6497 100644
--- a/scripts/default/html/edit-style.css
+++ b/scripts/default/html/edit-style.css
@@ -10,51 +10,51 @@
 
 @font-face {
     font-family: Raleway-Regular;
-    src: url(../../resources/fonts/Raleway-Regular.ttf),  /* Windows production */
-         url(../../fonts/Raleway-Regular.ttf),  /* OSX production */
-         url(../../interface/resources/fonts/Raleway-Regular.ttf);  /* Development, running script in /HiFi/examples */
+    src: url(../../../resources/fonts/Raleway-Regular.ttf),  /* Windows production */
+         url(../../../fonts/Raleway-Regular.ttf),  /* OSX production */
+         url(../../../interface/resources/fonts/Raleway-Regular.ttf);  /* Development, running script in /HiFi/examples */
 }
 
 @font-face {
     font-family: Raleway-Light;
-    src: url(../../resources/fonts/Raleway-Light.ttf),
-         url(../../fonts/Raleway-Light.ttf),
-         url(../../interface/resources/fonts/Raleway-Light.ttf);
+    src: url(../../../resources/fonts/Raleway-Light.ttf),
+         url(../../../fonts/Raleway-Light.ttf),
+         url(../../../interface/resources/fonts/Raleway-Light.ttf);
 }
 
 @font-face {
     font-family: Raleway-Bold;
-    src: url(../../resources/fonts/Raleway-Bold.ttf),
-         url(../../fonts/Raleway-Bold.ttf),
-         url(../../interface/resources/fonts/Raleway-Bold.ttf);
+    src: url(../../../resources/fonts/Raleway-Bold.ttf),
+         url(../../../fonts/Raleway-Bold.ttf),
+         url(../../../interface/resources/fonts/Raleway-Bold.ttf);
 }
 
 @font-face {
     font-family: Raleway-SemiBold;
-    src: url(../../resources/fonts/Raleway-SemiBold.ttf),
-         url(../../fonts/Raleway-SemiBold.ttf),
-         url(../../interface/resources/fonts/Raleway-SemiBold.ttf);
+    src: url(../../../resources/fonts/Raleway-SemiBold.ttf),
+         url(../../../fonts/Raleway-SemiBold.ttf),
+         url(../../../interface/resources/fonts/Raleway-SemiBold.ttf);
 }
 
 @font-face {
     font-family: FiraSans-SemiBold;
-    src: url(../../resources/fonts/FiraSans-SemiBold.ttf),
-         url(../../fonts/FiraSans-SemiBold.ttf),
-         url(../../interface/resources/fonts/FiraSans-SemiBold.ttf);
+    src: url(../../../resources/fonts/FiraSans-SemiBold.ttf),
+         url(../../../fonts/FiraSans-SemiBold.ttf),
+         url(../../../interface/resources/fonts/FiraSans-SemiBold.ttf);
 }
 
 @font-face {
     font-family: AnonymousPro-Regular;
-    src: url(../../resources/fonts/AnonymousPro-Regular.ttf),
-         url(../../fonts/AnonymousPro-Regular.ttf),
-         url(../../interface/resources/fonts/AnonymousPro-Regular.ttf);
+    src: url(../../../resources/fonts/AnonymousPro-Regular.ttf),
+         url(../../../fonts/AnonymousPro-Regular.ttf),
+         url(../../../interface/resources/fonts/AnonymousPro-Regular.ttf);
 }
 
 @font-face {
     font-family: HiFi-Glyphs;
-    src: url(../../resources/fonts/hifi-glyphs.ttf),
-         url(../../fonts/hifi-glyphs.ttf),
-         url(../../interface/resources/fonts/hifi-glyphs.ttf);
+    src: url(../../../resources/fonts/hifi-glyphs.ttf),
+         url(../../../fonts/hifi-glyphs.ttf),
+         url(../../../interface/resources/fonts/hifi-glyphs.ttf);
 }
 
 * {
diff --git a/scripts/default/notifications.js b/scripts/default/notifications.js
index 63d94fbd92..7d97470b8a 100644
--- a/scripts/default/notifications.js
+++ b/scripts/default/notifications.js
@@ -55,7 +55,7 @@
 //          createNotification(noteString, NotificationType.SNAPSHOT);
 //      }
 //  }
-Script.include("./libraries/globals.js");
+
 Script.include("./libraries/soundArray.js");
 
 var width = 340.0; //width of notification overlay
@@ -120,7 +120,8 @@ var NotificationType = {
 var randomSounds = new SoundArray({ localOnly: true }, true);
 var numberOfSounds = 2;
 for (var i = 1; i <= numberOfSounds; i++) {
-    randomSounds.addSound(HIFI_PUBLIC_BUCKET + "sounds/UI/notification-general" + i + ".raw");
+    
+    randomSounds.addSound(Script.resolvePath("assets/sounds/notification-general"+ i + ".raw"));
 }
 
 var notifications = [];
@@ -328,7 +329,7 @@ function createNotification(text, notificationType) {
         width: 10.0,
         height: 10.0,
         subImage: { x: 0, y: 0, width: 10, height: 10 },
-        imageURL: "http://hifi-public.s3.amazonaws.com/images/close-small-light.svg",
+        imageURL: Script.resolvePath("assets/images/close-small-light.svg"),
         color: { red: 255, green: 255, blue: 255},
         visible: true,
         alpha: backgroundAlpha
diff --git a/scripts/default/particle_explorer/particleExplorer.html b/scripts/default/particle_explorer/particleExplorer.html
index 2ab89c98ca..1de176214c 100644
--- a/scripts/default/particle_explorer/particleExplorer.html
+++ b/scripts/default/particle_explorer/particleExplorer.html
@@ -18,7 +18,7 @@
 <script type="text/javascript" src="underscore-min.js"></script>
 <script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script>
 <script type="text/javascript" src="../html/eventBridgeLoader.js"></script>
-<script type="text/javascript" src="particleExplorer.js?v42"></script>
+<script type="text/javascript" src="particleExplorer.js"></script>
 <script>
     function loaded() {
         // Disable right-click context menu which is not visible in the HMD and makes it seem like the app has locked
diff --git a/scripts/developer/tests/performance/simpleKeepAway.js b/scripts/developer/tests/performance/simpleKeepAway.js
index 05c0dd8159..9718600a9c 100644
--- a/scripts/developer/tests/performance/simpleKeepAway.js
+++ b/scripts/developer/tests/performance/simpleKeepAway.js
@@ -94,7 +94,7 @@ Script.setInterval(function () {
             gravity: GRAVITY,
             collisionsWillMove: true,
             lifetime: LIFETIME,
-            script: Script.resolvePath("../../entityScripts/simpleKeepAway.js")
+            script: Script.resolvePath("keepAwayEntity.js")
         };
         Entities.addEntity(properties);
         totalCreated++;
diff --git a/scripts/developer/tests/performance/tribbleEntity.js b/scripts/developer/tests/performance/tribbleEntity.js
index 22990af1d1..78b88ca48e 100644
--- a/scripts/developer/tests/performance/tribbleEntity.js
+++ b/scripts/developer/tests/performance/tribbleEntity.js
@@ -1,6 +1,6 @@
 (function () {
     // See tests/performance/tribbles.js
-    Script.include("../libraries/virtualBaton.js");
+    Script.include("../../libraries/virtualBaton.js");
     var dimensions, oldColor, entityID,
         editRate = 60,
         moveRate = 1,
diff --git a/scripts/developer/tests/performance/tribbles.js b/scripts/developer/tests/performance/tribbles.js
index f4eef2ff1a..c9ae347a82 100644
--- a/scripts/developer/tests/performance/tribbles.js
+++ b/scripts/developer/tests/performance/tribbles.js
@@ -86,7 +86,7 @@ Script.setInterval(function () {
             gravity: GRAVITY,
             collisionsWillMove: true,
             lifetime: LIFETIME,
-            script: Script.resolvePath("../../entityScripts/tribble.js")
+            script: Script.resolvePath("tribbleEntity.js")
         });
 
         totalCreated++;