diff --git a/unpublishedScripts/DomainContent/Toybox/basketballsResetter.js b/unpublishedScripts/DomainContent/Toybox/basketballsResetter.js
index 76cc4e8331..580453bf24 100644
--- a/unpublishedScripts/DomainContent/Toybox/basketballsResetter.js
+++ b/unpublishedScripts/DomainContent/Toybox/basketballsResetter.js
@@ -6,7 +6,6 @@
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
 
 (function() {
 
@@ -42,8 +41,8 @@ var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
         createBasketballs: function() {
             var NUMBER_OF_BALLS = 4;
             var DIAMETER = 0.30;
-            var basketballURL = HIFI_PUBLIC_BUCKET + "models/content/basketball2.fbx";
-            var basketballCollisionSoundURL = HIFI_PUBLIC_BUCKET + "sounds/basketball/basketball.wav";
+            var basketballURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx";
+            var basketballCollisionSoundURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav";
 
             var position = {
                 x: 542.86,
diff --git a/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js b/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js
index a1010b4dd7..ec1bd94d4c 100644
--- a/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js
+++ b/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js
@@ -60,7 +60,6 @@
     MasterReset = function() {
         var resetKey = "resetMe";
 
-        var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
 
         var shouldDeleteOnEndScript = false;
 
@@ -168,7 +167,7 @@
         }
 
         function createRaveStick(position) {
-            var modelURL = "http://hifi-content.s3.amazonaws.com/eric/models/raveStick.fbx";
+            var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flowArts/raveStick.fbx";
             var rotation = Quat.fromPitchYawRollDegrees(0, 0, 0);
             var stick = Entities.addEntity({
                 type: "Model",
@@ -258,7 +257,7 @@
                 alphaSpread: 0.1,
                 alphaStart: 0.1,
                 alphaFinish: 0.1,
-                textures: "https://s3.amazonaws.com/hifi-public/eric/textures/particleSprites/beamParticle.png",
+                textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flowArts/beamParticle.png",
                 emitterShouldTrail: false,
                 userData: JSON.stringify({
                     resetMe: {
@@ -270,7 +269,7 @@
         }
 
         function createGun(position) {
-            var modelURL = "https://s3.amazonaws.com/hifi-public/eric/models/gun.fbx";
+            var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/gun.fbx";
 
             var pistol = Entities.addEntity({
                 type: 'Model',
@@ -279,7 +278,7 @@
                 position: position,
                 restitution: 0,
                 damping: 0.5,
-                collisionSoundURL: "http://hifi-content.s3.amazonaws.com/james/pistol/sounds/drop.wav",
+                collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/drop.wav",
                 dimensions: {
                     x: 0.05,
                     y: 0.23,
@@ -343,8 +342,8 @@
 
             var SCRIPT_URL = Script.resolvePath('bow.js');
             var BOW_ROTATION = Quat.fromPitchYawRollDegrees(-103.05, -178.60, -87.27);
-            var MODEL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow-deadly.fbx";
-            var COLLISION_HULL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow_collision_hull.obj";
+            var MODEL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow-deadly.fbx";
+            var COLLISION_HULL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow_collision_hull.obj";
 
             var BOW_DIMENSIONS = {
                 x: 0.04,
@@ -496,7 +495,7 @@
                 type: "ParticleEffect",
                 name: "fire",
                 animationSettings: animationSettings,
-                textures: "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png",
+                textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/fire/Particle-Sprite-Smoke-1.png",
                 position: {
                     x: 551.45,
                     y: 494.82,
@@ -559,10 +558,10 @@
             var DIAMETER = 0.30;
             var RESET_DISTANCE = 1;
             var MINIMUM_MOVE_LENGTH = 0.05;
-            var basketballURL = HIFI_PUBLIC_BUCKET + "models/content/basketball2.fbx";
-            var basketballCollisionSoundURL = HIFI_PUBLIC_BUCKET + "sounds/basketball/basketball.wav";
-            var rackURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/basketball_rack.fbx";
-            var rackCollisionHullURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/rack_collision_hull.obj";
+            var basketballURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx";
+            var basketballCollisionSoundURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav";
+            var rackURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_rack.fbx";
+            var rackCollisionHullURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/rack_collision_hull.obj";
 
             var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0);
 
@@ -638,7 +637,7 @@
                             z: 0
                         },
                         dynamic: true,
-                        collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
+                        collisionSoundURL: 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav',
                         collisionless: false,
                         modelURL: basketballURL,
                         userData: JSON.stringify({
@@ -733,8 +732,8 @@
 
         function createTargets() {
 
-            var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx';
-            var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target_collision_hull.obj';
+            var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx';
+            var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj';
 
             var MINIMUM_MOVE_LENGTH = 0.05;
             var RESET_DISTANCE = 0.5;
@@ -813,8 +812,8 @@
 
         function createCat(position) {
 
-            var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/Dark_Cat.fbx";
-            var animationURL = "http://hifi-public.s3.amazonaws.com/ryan/sleeping.fbx";
+            var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/Dark_Cat.fbx";
+            var animationURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/sleeping.fbx";
             var animationSettings = JSON.stringify({
                 running: true
             });
@@ -850,7 +849,7 @@
         }
 
         function createFlashlight(position) {
-            var modelURL = "https://hifi-public.s3.amazonaws.com/models/props/flashlight.fbx";
+            var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight.fbx";
 
             var flashlight = Entities.addEntity({
                 type: "Model",
@@ -864,7 +863,7 @@
                     z: 0.08
                 },
                 dynamic: true,
-                collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/flashlight_drop.L.wav",
+                collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight_drop.L.wav",
                 gravity: {
                     x: 0,
                     y: -3.5,
@@ -915,7 +914,7 @@
         }
 
         function createLights() {
-            var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/lightswitch.fbx";
+            var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/lights/lightswitch.fbx";
 
 
             var rotation = {
@@ -1163,8 +1162,8 @@
         function createDice() {
             var diceProps = {
                 type: "Model",
-                modelURL: "http://s3.amazonaws.com/hifi-public/models/props/Dice/goldDie.fbx",
-                collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/dice/diceCollide.wav",
+                modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/goldDie.fbx",
+                collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/diceCollide.wav",
                 name: "dice",
                 position: {
                     x: 541.61,
@@ -1211,7 +1210,7 @@
         }
 
         function createGates() {
-            var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx';
+            var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/gates/fence.fbx';
 
             var rotation = Quat.fromPitchYawRollDegrees(0, -16, 0);
             var gate = Entities.addEntity({
@@ -1252,9 +1251,9 @@
 
         function createPingPongBallGun() {
 
-            var MODEL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.fbx';
-            var COLLISION_HULL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.obj';
-            var COLLISION_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/plastic_impact.L.wav';
+            var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.fbx';
+            var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.obj';
+            var COLLISION_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/plastic_impact.L.wav';
             var position = {
                 x: 548.6,
                 y: 495.4,
@@ -1320,8 +1319,8 @@
         }
 
         function createWand(position) {
-            var WAND_MODEL = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand.fbx';
-            var WAND_COLLISION_SHAPE = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand_collision_hull.obj';
+            var WAND_MODEL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand.fbx';
+            var WAND_COLLISION_SHAPE = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand_collision_hull.obj';
 
             var wand = Entities.addEntity({
                 name: 'Bubble Wand',
@@ -1381,7 +1380,7 @@
 
         function createBasketBall(position) {
 
-            var modelURL = "http://s3.amazonaws.com/hifi-public/models/content/basketball2.fbx";
+            var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx";
 
             var entity = Entities.addEntity({
                 type: "Model",
@@ -1407,7 +1406,7 @@
                     y: -0.01,
                     z: 0
                 },
-                collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/basketball/basketball.wav",
+                collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav",
                 userData: JSON.stringify({
                     resetMe: {
                         resetMe: true
@@ -1421,7 +1420,7 @@
         }
 
         function createDoll(position) {
-            var modelURL = "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx";
+            var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/doll/bboy2.fbx";
 
             var naturalDimensions = {
                 x: 1.63,
@@ -1462,7 +1461,7 @@
 
         function createSprayCan(position) {
 
-            var modelURL = "https://hifi-public.s3.amazonaws.com/eric/models/paintcan.fbx";
+            var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/paintcan.fbx";
 
             var entity = Entities.addEntity({
                 type: "Model",
@@ -1476,7 +1475,7 @@
                     z: 0.07
                 },
                 dynamic: true,
-                collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/SpryPntCnDrp1.L.wav",
+                collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/SpryPntCnDrp1.L.wav",
                 shapeType: 'box',
                 restitution: 0,
                 gravity: {
@@ -1502,7 +1501,7 @@
         }
 
         function createPottedPlant(position) {
-            var modelURL = "http://hifi-public.s3.amazonaws.com/models/potted_plant/potted_plant.fbx";
+            var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/potted_plant/potted_plant.fbx";
 
             var entity = Entities.addEntity({
                 type: "Model",
@@ -1540,8 +1539,8 @@
 
 
         function createCombinedArmChair(position) {
-            var modelURL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/combined_chair.fbx";
-            var RED_ARM_CHAIR_COLLISION_HULL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/red_arm_chair_collision_hull.obj";
+            var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/armchair/combined_chair.fbx";
+            var RED_ARM_CHAIR_COLLISION_HULL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/armchair/red_arm_chair_collision_hull.obj";
 
             var rotation = Quat.fromPitchYawRollDegrees(0, -143, 0);
 
@@ -1583,8 +1582,8 @@
         }
 
         function createBlocks(position) {
-            var baseURL = HIFI_PUBLIC_BUCKET + "models/content/planky/";
-            var collisionSoundURL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav";
+            var baseURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky";
+            var collisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky/ToyWoodBlock.L.wav";
             var NUM_BLOCKS_PER_COLOR = 4;
             var i, j;
 
diff --git a/unpublishedScripts/DomainContent/Toybox/masterReset.js b/unpublishedScripts/DomainContent/Toybox/masterReset.js
index 4820aa6292..1460536e7d 100644
--- a/unpublishedScripts/DomainContent/Toybox/masterReset.js
+++ b/unpublishedScripts/DomainContent/Toybox/masterReset.js
@@ -20,11 +20,11 @@ var catScriptURL = Script.resolvePath("cat/cat.js");
 var flashlightScriptURL = Script.resolvePath('flashlight/flashlight.js');
 var pingPongScriptURL = Script.resolvePath('ping_pong_gun/pingPongGun.js');
 var wandScriptURL = Script.resolvePath("bubblewand/wand.js");
-var dollScriptURL = Script.resolvePath("doll.js");
+var dollScriptURL = Script.resolvePath("doll/doll.js");
 var lightsScriptURL = Script.resolvePath("lights/lightSwitch.js");
-var bowScriptURL = Script.resolvePath("toybox/bow/bow.js");
+var targetsScriptURL = Script.resolvePath('ping_pong_gun/wallTarget.js');
+var bowScriptURL = Script.resolvePath('bow/bow.js');
 var raveStickEntityScriptURL = Script.resolvePath("flowArts/raveStick/raveStickEntityScript.js");
-var targetsScriptURL = Script.resolvePath('toybox/ping_pong_gun/wallTarget.js');
 var basketballResetterScriptURL = Script.resolvePath('basketballsResetter.js');
 var targetsResetterScriptURL = Script.resolvePath('targetsResetter.js');
 
@@ -32,7 +32,6 @@ var targetsResetterScriptURL = Script.resolvePath('targetsResetter.js');
 MasterReset = function() {
     var resetKey = "resetMe";
 
-    var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
 
     var shouldDeleteOnEndScript = false;
 
@@ -148,7 +147,7 @@ MasterReset = function() {
     }
 
     function createRaveStick(position) {
-        var modelURL = "http://hifi-content.s3.amazonaws.com/eric/models/raveStick.fbx";
+        var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flowArts/raveStick.fbx";
         var rotation = Quat.fromPitchYawRollDegrees(0, 0, 0);
         var stick = Entities.addEntity({
             type: "Model",
@@ -243,7 +242,7 @@ MasterReset = function() {
             alphaSpread: 0.1,
             alphaStart: 0.1,
             alphaFinish: 0.1,
-            textures: "https://s3.amazonaws.com/hifi-public/eric/textures/particleSprites/beamParticle.png",
+            textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flowArts/beamParticle.png",
             emitterShouldTrail: false,
             userData: JSON.stringify({
                 resetMe: {
@@ -254,7 +253,8 @@ MasterReset = function() {
     }
 
     function createGun(position) {
-        var modelURL = "https://s3.amazonaws.com/hifi-public/eric/models/gun.fbx";
+        var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/gun.fbx";
+
 
         var pistol = Entities.addEntity({
             type: 'Model',
@@ -281,7 +281,7 @@ MasterReset = function() {
             restitution: 0,
             dynamic: true,
             damping: 0.5,
-            collisionSoundURL: "http://hifi-content.s3.amazonaws.com/james/pistol/sounds/drop.wav",
+            collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/drop.wav",
             userData: JSON.stringify({
                 "wearable": {
                     "joints": {
@@ -327,9 +327,8 @@ MasterReset = function() {
 
         var SCRIPT_URL = Script.resolvePath('bow.js');
         var BOW_ROTATION = Quat.fromPitchYawRollDegrees(-103.05, -178.60, -87.27);
-        var MODEL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow-deadly.fbx";
-        var COLLISION_HULL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow_collision_hull.obj";
-
+        var MODEL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow-deadly.fbx";
+        var COLLISION_HULL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow_collision_hull.obj";
         var BOW_DIMENSIONS = {
             x: 0.04,
             y: 1.3,
@@ -480,7 +479,7 @@ MasterReset = function() {
             type: "ParticleEffect",
             name: "fire",
             animationSettings: animationSettings,
-            textures: "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png",
+            textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/fire/Particle-Sprite-Smoke-1.png",
             position: {
                 x: 551.45,
                 y: 494.82,
@@ -544,10 +543,10 @@ MasterReset = function() {
         var DIAMETER = 0.30;
         var RESET_DISTANCE = 1;
         var MINIMUM_MOVE_LENGTH = 0.05;
-        var basketballURL = HIFI_PUBLIC_BUCKET + "models/content/basketball2.fbx";
-        var basketballCollisionSoundURL = HIFI_PUBLIC_BUCKET + "sounds/basketball/basketball.wav";
-        var rackURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/basketball_rack.fbx";
-        var rackCollisionHullURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/rack_collision_hull.obj";
+        var basketballURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx";
+        var basketballCollisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav";
+        var rackURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_rack.fbx";
+        var rackCollisionHullURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/rack_collision_hull.obj";
 
         var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0);
 
@@ -624,7 +623,7 @@ MasterReset = function() {
                         z: 0
                     },
                     dynamic: true,
-                    collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
+                    collisionSoundURL: 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav',
                     collisionless: false,
                     modelURL: basketballURL,
                     userData: JSON.stringify({
@@ -721,8 +720,8 @@ MasterReset = function() {
     function createTargets() {
 
 
-        var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx';
-        var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target_collision_hull.obj';
+        var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx';
+        var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj';
 
         var MINIMUM_MOVE_LENGTH = 0.05;
         var RESET_DISTANCE = 0.5;
@@ -801,8 +800,8 @@ MasterReset = function() {
 
     function createCat(position) {
 
-        var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/Dark_Cat.fbx";
-        var animationURL = "http://hifi-public.s3.amazonaws.com/ryan/sleeping.fbx";
+        var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/Dark_Cat.fbx";
+        var animationURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/sleeping.fbx";
         var animationSettings = JSON.stringify({
             running: true
         });
@@ -838,7 +837,7 @@ MasterReset = function() {
     }
 
     function createFlashlight(position) {
-        var modelURL = "https://hifi-public.s3.amazonaws.com/models/props/flashlight.fbx";
+        var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight.fbx";
 
         var flashlight = Entities.addEntity({
             type: "Model",
@@ -852,7 +851,7 @@ MasterReset = function() {
                 z: 0.08
             },
             dynamic: true,
-            collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/flashlight_drop.L.wav",
+            collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight_drop.L.wav",
             gravity: {
                 x: 0,
                 y: -3.5,
@@ -903,8 +902,7 @@ MasterReset = function() {
     }
 
     function createLights() {
-        var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/lightswitch.fbx";
-
+        var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/lights/lightswitch.fbx";
 
         var rotation = {
             w: 0.63280689716339111,
@@ -1151,8 +1149,8 @@ MasterReset = function() {
     function createDice() {
         var diceProps = {
             type: "Model",
-            modelURL: "http://s3.amazonaws.com/hifi-public/models/props/Dice/goldDie.fbx",
-            collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/dice/diceCollide.wav",
+            modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/goldDie.fbx",
+            collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/diceCollide.wav",
             name: "dice",
             position: {
                 x: 541.61,
@@ -1199,8 +1197,7 @@ MasterReset = function() {
     }
 
     function createGates() {
-        var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx';
-
+        var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/gates/fence.fbx';
         var rotation = Quat.fromPitchYawRollDegrees(0, -16, 0);
         var gate = Entities.addEntity({
             name: 'Front Door Fence',
@@ -1239,10 +1236,9 @@ MasterReset = function() {
     }
 
     function createPingPongBallGun() {
-        var MODEL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.fbx';
-        var COLLISION_HULL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.obj';
-
-        var COLLISION_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/plastic_impact.L.wav';
+        var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.fbx';
+        var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.obj';
+        var COLLISION_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/plastic_impact.L.wav';
         var position = {
             x: 548.6,
             y: 495.4,
@@ -1308,8 +1304,8 @@ MasterReset = function() {
     }
 
     function createWand(position) {
-        var WAND_MODEL = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand.fbx';
-        var WAND_COLLISION_SHAPE = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand_collision_hull.obj';
+        var WAND_MODEL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand.fbx';
+        var WAND_COLLISION_SHAPE = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand_collision_hull.obj';
 
         var wand = Entities.addEntity({
             name: 'Bubble Wand',
@@ -1369,7 +1365,7 @@ MasterReset = function() {
 
     function createBasketBall(position) {
 
-        var modelURL = "http://s3.amazonaws.com/hifi-public/models/content/basketball2.fbx";
+        var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx";
 
         var entity = Entities.addEntity({
             type: "Model",
@@ -1395,7 +1391,7 @@ MasterReset = function() {
                 y: -0.01,
                 z: 0
             },
-            collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/basketball/basketball.wav",
+            collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav",
             userData: JSON.stringify({
                 resetMe: {
                     resetMe: true
@@ -1409,7 +1405,7 @@ MasterReset = function() {
     }
 
     function createDoll(position) {
-        var modelURL = "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx";
+        var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/doll/bboy2.fbx";
 
         var naturalDimensions = {
             x: 1.63,
@@ -1450,7 +1446,8 @@ MasterReset = function() {
 
     function createSprayCan(position) {
 
-        var modelURL = "https://hifi-public.s3.amazonaws.com/eric/models/paintcan.fbx";
+
+        var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/paintcan.fbx";
 
         var entity = Entities.addEntity({
             type: "Model",
@@ -1464,7 +1461,7 @@ MasterReset = function() {
                 z: 0.07
             },
             dynamic: true,
-            collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/SpryPntCnDrp1.L.wav",
+            collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/SpryPntCnDrp1.L.wav",
             shapeType: 'box',
             gravity: {
                 x: 0,
@@ -1490,7 +1487,7 @@ MasterReset = function() {
     }
 
     function createPottedPlant(position) {
-        var modelURL = "http://hifi-public.s3.amazonaws.com/models/potted_plant/potted_plant.fbx";
+        var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/potted_plant/potted_plant.fbx";
 
         var entity = Entities.addEntity({
             type: "Model",
@@ -1528,8 +1525,8 @@ MasterReset = function() {
 
 
     function createCombinedArmChair(position) {
-        var modelURL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/combined_chair.fbx";
-        var RED_ARM_CHAIR_COLLISION_HULL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/red_arm_chair_collision_hull.obj";
+        var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/armchair/combined_chair.fbx";
+        var RED_ARM_CHAIR_COLLISION_HULL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/armchair/red_arm_chair_collision_hull.obj";
 
         var rotation = Quat.fromPitchYawRollDegrees(0, -143, 0);
 
@@ -1571,8 +1568,8 @@ MasterReset = function() {
     }
 
     function createBlocks(position) {
-        var baseURL = HIFI_PUBLIC_BUCKET + "models/content/planky/";
-        var collisionSoundURL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav";
+        var baseURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky";
+        var collisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky/ToyWoodBlock.L.wav";
         var NUM_BLOCKS_PER_COLOR = 4;
         var i, j;
 
diff --git a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createPingPongGun.js b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createPingPongGun.js
index 467a05b5b6..5f0c00a7bc 100644
--- a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createPingPongGun.js
+++ b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createPingPongGun.js
@@ -13,9 +13,9 @@ Script.include("../../libraries/utils.js");
 
 var scriptURL = Script.resolvePath('pingPongGun.js');
 
-var MODEL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.fbx'
-var COLLISION_HULL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.obj';
-var COLLISION_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/plastic_impact.L.wav';
+var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.fbx'
+var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.obj';
+var COLLISION_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/plastic_impact.L.wav';
 var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
   x: 0,
   y: 0.5,
diff --git a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createTargets.js b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createTargets.js
index 2685599824..1dfe02e31c 100644
--- a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createTargets.js
+++ b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createTargets.js
@@ -14,8 +14,8 @@
 Script.include("utils.js");
 var scriptURL = Script.resolvePath('wallTarget.js');
 
-var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx';
-var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target_collision_hull.obj';
+var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx';
+var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj';
 var MINIMUM_MOVE_LENGTH = 0.05;
 var RESET_DISTANCE = 0.5;
 
diff --git a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/pingPongGun.js b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/pingPongGun.js
index 24edbe8522..37c909cb6e 100644
--- a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/pingPongGun.js
+++ b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/pingPongGun.js
@@ -13,8 +13,8 @@
 
     Script.include("utils.js");
 
-    var SHOOTING_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/ping_pong_gun/pong_sound.wav';
-    var PING_PONG_BALL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_ball.fbx';
+    var SHOOTING_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/pong_sound.wav';
+    var PING_PONG_BALL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/ping_pong_ball.fbx';
 
     function PingPongGun() {
         return;
diff --git a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/wallTarget.js b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/wallTarget.js
index 5aa46b1dc7..267faff4ed 100644
--- a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/wallTarget.js
+++ b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/wallTarget.js
@@ -20,7 +20,7 @@
         hasBecomeActive: false,
         preload: function(entityID) {
             this.entityID = entityID;
-            var SOUND_URL = "http://hifi-public.s3.amazonaws.com/sounds/Clay_Pigeon_02.L.wav";
+            var SOUND_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Clay_Pigeon_02.L.wav";
             this.hitSound = SoundCache.getSound(SOUND_URL);
         },
         collisionWithEntity: function(me, otherEntity) {
diff --git a/unpublishedScripts/DomainContent/Toybox/pistol/createPistol.js b/unpublishedScripts/DomainContent/Toybox/pistol/createPistol.js
index 1608c2fa4b..c3069547cb 100644
--- a/unpublishedScripts/DomainContent/Toybox/pistol/createPistol.js
+++ b/unpublishedScripts/DomainContent/Toybox/pistol/createPistol.js
@@ -1,6 +1,6 @@
 var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1.5, Quat.getFront(Camera.getOrientation())));
 var scriptURL = Script.resolvePath('pistol.js');
-var modelURL = "https://s3.amazonaws.com/hifi-public/eric/models/gun.fbx";
+var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/gun.fbx";
 
 
 var pistol = Entities.addEntity({
@@ -27,7 +27,7 @@ var pistol = Entities.addEntity({
     },
     restitution: 0,
     damping:0.5,
-    collisionSoundURL: "http://hifi-content.s3.amazonaws.com/james/pistol/sounds/drop.wav",
+    collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/drop.wav",
     userData: JSON.stringify({
         grabbableKey: {
             invertSolidWhileHeld: true
diff --git a/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js b/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
index 272da68bec..3371248474 100644
--- a/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
+++ b/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
@@ -27,8 +27,8 @@
         this.forceMultiplier = 1;
         this.laserLength = 100;
 
-        this.fireSound = SoundCache.getSound("https://s3.amazonaws.com/hifi-public/sounds/Guns/GUN-SHOT2.raw");
-        this.ricochetSound = SoundCache.getSound("https://s3.amazonaws.com/hifi-public/sounds/Guns/Ricochet.L.wav");
+        this.fireSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/GUN-SHOT2.raw");
+        this.ricochetSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/Ricochet.L.wav");
         this.playRichochetSoundChance = 0.1;
         this.fireVolume = 0.2;
         this.bulletForce = 10;
@@ -216,7 +216,7 @@
                 "alphaStart": 0,
                 "alphaFinish": 0,
                 "additiveBlending": true,
-                "textures": "http://ericrius1.github.io/PartiArt/assets/star.png"
+                "textures": "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/star.png"
             });
 
             Script.setTimeout(function() {
diff --git a/unpublishedScripts/DomainContent/Toybox/spray_paint/sprayPaintCan.js b/unpublishedScripts/DomainContent/Toybox/spray_paint/sprayPaintCan.js
index 05d9b4efc5..9d906eaf42 100644
--- a/unpublishedScripts/DomainContent/Toybox/spray_paint/sprayPaintCan.js
+++ b/unpublishedScripts/DomainContent/Toybox/spray_paint/sprayPaintCan.js
@@ -15,7 +15,7 @@
 
     Script.include("libraries/utils.js");
 
-    this.spraySound = SoundCache.getSound("https://s3.amazonaws.com/hifi-public/sounds/sprayPaintSound.wav");
+    this.spraySound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/spray_paint.wav");
 
     var TIP_OFFSET_Z = 0.02;
     var TIP_OFFSET_Y = 0.08;
@@ -63,7 +63,7 @@
             name: "streamEffect",
             isEmitting: true,
             position: position,
-            textures: "https://raw.githubusercontent.com/ericrius1/SantasLair/santa/assets/smokeparticle.png",
+            textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/smokeparticle.png",
             emitSpeed: 3,
             speedSpread: 0.02,
             emitAcceleration: ZERO_VEC,
diff --git a/unpublishedScripts/DomainContent/Toybox/targetsResetter.js b/unpublishedScripts/DomainContent/Toybox/targetsResetter.js
index 10ba968ac9..d8253fc48a 100644
--- a/unpublishedScripts/DomainContent/Toybox/targetsResetter.js
+++ b/unpublishedScripts/DomainContent/Toybox/targetsResetter.js
@@ -44,8 +44,8 @@
 
         createTargets: function() {
 
-            var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx';
-            var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target_collision_hull.obj';
+            var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx';
+            var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj';
 
             var MINIMUM_MOVE_LENGTH = 0.05;
             var RESET_DISTANCE = 0.5;