diff --git a/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-min-hand.fbx b/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-min-hand.fbx
new file mode 100644
index 0000000000..b504da13bd
Binary files /dev/null and b/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-min-hand.fbx differ
diff --git a/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-sec-hand.fbx b/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-sec-hand.fbx
new file mode 100644
index 0000000000..12aa85f126
Binary files /dev/null and b/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-sec-hand.fbx differ
diff --git a/unpublishedScripts/marketplace/stopwatch/models/Stopwatch.fbx b/unpublishedScripts/marketplace/stopwatch/models/Stopwatch.fbx
new file mode 100644
index 0000000000..073544875e
Binary files /dev/null and b/unpublishedScripts/marketplace/stopwatch/models/Stopwatch.fbx differ
diff --git a/unpublishedScripts/marketplace/stopwatch/chime.wav b/unpublishedScripts/marketplace/stopwatch/sounds/chime.wav
similarity index 100%
rename from unpublishedScripts/marketplace/stopwatch/chime.wav
rename to unpublishedScripts/marketplace/stopwatch/sounds/chime.wav
diff --git a/unpublishedScripts/marketplace/stopwatch/tick.wav b/unpublishedScripts/marketplace/stopwatch/sounds/tick.wav
similarity index 100%
rename from unpublishedScripts/marketplace/stopwatch/tick.wav
rename to unpublishedScripts/marketplace/stopwatch/sounds/tick.wav
diff --git a/unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js b/unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js
index bdd2cb3a79..e72f949163 100644
--- a/unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js
+++ b/unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js
@@ -18,7 +18,7 @@ var stopwatchID = Entities.addEntity({
     type: "Model",
     name: "stopwatch/base",
     position: positionToSpawn,
-    modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Stopwatch.fbx",
+    modelURL: Script.resolvePath("models/Stopwatch.fbx"),
     dimensions: Vec3.multiply(scale, {"x":4.129462242126465,"y":1.058512806892395,"z":5.773681640625}),
     rotation: Quat.multiply(MyAvatar.orientation, Quat.fromPitchYawRollDegrees(90, 0, 0))
 });
@@ -30,7 +30,7 @@ var secondHandID = Entities.addEntity({
     localPosition: Vec3.multiply(scale, {"x":-0.004985813982784748,"y":0.39391064643859863,"z":0.8312804698944092}),
     dimensions: Vec3.multiply(scale, {"x":0.14095762372016907,"y":0.02546107769012451,"z":1.6077008247375488}),
     registrationPoint: {"x":0.5,"y":0.5,"z":1},
-    modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Stopwatch-sec-hand.fbx",
+    modelURL: Script.resolvePath("models/Stopwatch-sec-hand.fbx"),
 });
 
 var minuteHandID = Entities.addEntity({
@@ -40,7 +40,7 @@ var minuteHandID = Entities.addEntity({
     localPosition: Vec3.multiply(scale, {"x":-0.0023056098725646734,"y":0.3308190703392029,"z":0.21810021996498108}),
     dimensions: Vec3.multiply(scale, {"x":0.045471154153347015,"y":0.015412690117955208,"z":0.22930574417114258}),
     registrationPoint: {"x":0.5,"y":0.5,"z":1},
-    modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Stopwatch-min-hand.fbx",
+    modelURL: Script.resolvePath("models/Stopwatch-min-hand.fbx"),
 });
 
 Entities.editEntity(stopwatchID, {
diff --git a/unpublishedScripts/marketplace/stopwatch/stopwatchServer.js b/unpublishedScripts/marketplace/stopwatch/stopwatchServer.js
index b923d6af88..8b36b48cde 100644
--- a/unpublishedScripts/marketplace/stopwatch/stopwatchServer.js
+++ b/unpublishedScripts/marketplace/stopwatch/stopwatchServer.js
@@ -17,11 +17,11 @@
     self.secondHandID = null;
     self.minuteHandID = null;
 
-    self.tickSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/huffman/tick.wav");
+    self.tickSound = SoundCache.getSound(Script.resolvePath("sounds/tick.wav"));
     self.tickInjector = null;
     self.tickIntervalID = null;
 
-    self.chimeSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/huffman/chime.wav");
+    self.chimeSound = SoundCache.getSound(Script.resolvePath("sounds/chime.wav"));
 
     self.preload = function(entityID) {
         print("Preloading stopwatch: ", entityID);