diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 2270118861..147c7bdec3 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -33,6 +33,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
 var DEFAULT_SCRIPTS_SEPARATE = [
     "system/controllers/controllerScripts.js",
     // "system/chat.js"
+    "system/fingerPaint/fingerPaint.js"
 ];
 
 // add a menu item for debugging
diff --git a/script-archive/fingerPaint/PaintWindow.qml b/scripts/system/fingerPaint/PaintWindow.qml
similarity index 100%
rename from script-archive/fingerPaint/PaintWindow.qml
rename to scripts/system/fingerPaint/PaintWindow.qml
diff --git a/script-archive/fingerPaint/content/CheckerBoard.qml b/scripts/system/fingerPaint/content/CheckerBoard.qml
similarity index 100%
rename from script-archive/fingerPaint/content/CheckerBoard.qml
rename to scripts/system/fingerPaint/content/CheckerBoard.qml
diff --git a/script-archive/fingerPaint/content/ColorUtils.js b/scripts/system/fingerPaint/content/ColorUtils.js
similarity index 100%
rename from script-archive/fingerPaint/content/ColorUtils.js
rename to scripts/system/fingerPaint/content/ColorUtils.js
diff --git a/script-archive/fingerPaint/content/ColorWheel.qml b/scripts/system/fingerPaint/content/ColorWheel.qml
similarity index 100%
rename from script-archive/fingerPaint/content/ColorWheel.qml
rename to scripts/system/fingerPaint/content/ColorWheel.qml
diff --git a/script-archive/fingerPaint/content/NumberBox.qml b/scripts/system/fingerPaint/content/NumberBox.qml
similarity index 100%
rename from script-archive/fingerPaint/content/NumberBox.qml
rename to scripts/system/fingerPaint/content/NumberBox.qml
diff --git a/script-archive/fingerPaint/content/PanelBorder.qml b/scripts/system/fingerPaint/content/PanelBorder.qml
similarity index 100%
rename from script-archive/fingerPaint/content/PanelBorder.qml
rename to scripts/system/fingerPaint/content/PanelBorder.qml
diff --git a/script-archive/fingerPaint/content/VerticalSlider.qml b/scripts/system/fingerPaint/content/VerticalSlider.qml
similarity index 100%
rename from script-archive/fingerPaint/content/VerticalSlider.qml
rename to scripts/system/fingerPaint/content/VerticalSlider.qml
diff --git a/script-archive/fingerPaint/content/Wheel.qml b/scripts/system/fingerPaint/content/Wheel.qml
similarity index 100%
rename from script-archive/fingerPaint/content/Wheel.qml
rename to scripts/system/fingerPaint/content/Wheel.qml
diff --git a/script-archive/fingerPaint/content/brushes/paintbrush1.png b/scripts/system/fingerPaint/content/brushes/paintbrush1.png
similarity index 100%
rename from script-archive/fingerPaint/content/brushes/paintbrush1.png
rename to scripts/system/fingerPaint/content/brushes/paintbrush1.png
diff --git a/script-archive/fingerPaint/content/brushes/paintbrush2.png b/scripts/system/fingerPaint/content/brushes/paintbrush2.png
similarity index 100%
rename from script-archive/fingerPaint/content/brushes/paintbrush2.png
rename to scripts/system/fingerPaint/content/brushes/paintbrush2.png
diff --git a/script-archive/fingerPaint/content/brushes/paintbrush3.png b/scripts/system/fingerPaint/content/brushes/paintbrush3.png
similarity index 100%
rename from script-archive/fingerPaint/content/brushes/paintbrush3.png
rename to scripts/system/fingerPaint/content/brushes/paintbrush3.png
diff --git a/script-archive/fingerPaint/content/brushes/paintbrush4.png b/scripts/system/fingerPaint/content/brushes/paintbrush4.png
similarity index 100%
rename from script-archive/fingerPaint/content/brushes/paintbrush4.png
rename to scripts/system/fingerPaint/content/brushes/paintbrush4.png
diff --git a/script-archive/fingerPaint/content/brushes/paintbrush5.png b/scripts/system/fingerPaint/content/brushes/paintbrush5.png
similarity index 100%
rename from script-archive/fingerPaint/content/brushes/paintbrush5.png
rename to scripts/system/fingerPaint/content/brushes/paintbrush5.png
diff --git a/script-archive/fingerPaint/content/brushes/paintbrush6.png b/scripts/system/fingerPaint/content/brushes/paintbrush6.png
similarity index 100%
rename from script-archive/fingerPaint/content/brushes/paintbrush6.png
rename to scripts/system/fingerPaint/content/brushes/paintbrush6.png
diff --git a/script-archive/fingerPaint/content/mathUtils.js b/scripts/system/fingerPaint/content/mathUtils.js
similarity index 100%
rename from script-archive/fingerPaint/content/mathUtils.js
rename to scripts/system/fingerPaint/content/mathUtils.js
diff --git a/script-archive/fingerPaint/content/tabicons/brushesBtn.png b/scripts/system/fingerPaint/content/tabicons/brushesBtn.png
similarity index 100%
rename from script-archive/fingerPaint/content/tabicons/brushesBtn.png
rename to scripts/system/fingerPaint/content/tabicons/brushesBtn.png
diff --git a/script-archive/fingerPaint/content/tabicons/colorpaletteBtn.png b/scripts/system/fingerPaint/content/tabicons/colorpaletteBtn.png
similarity index 100%
rename from script-archive/fingerPaint/content/tabicons/colorpaletteBtn.png
rename to scripts/system/fingerPaint/content/tabicons/colorpaletteBtn.png
diff --git a/script-archive/fingerPaint/content/tabicons/eraser.png b/scripts/system/fingerPaint/content/tabicons/eraser.png
similarity index 100%
rename from script-archive/fingerPaint/content/tabicons/eraser.png
rename to scripts/system/fingerPaint/content/tabicons/eraser.png
diff --git a/script-archive/fingerPaint/content/tabicons/linewidthBtn.png b/scripts/system/fingerPaint/content/tabicons/linewidthBtn.png
similarity index 100%
rename from script-archive/fingerPaint/content/tabicons/linewidthBtn.png
rename to scripts/system/fingerPaint/content/tabicons/linewidthBtn.png
diff --git a/script-archive/fingerPaint/content/tabicons/pointingfinger128px.png b/scripts/system/fingerPaint/content/tabicons/pointingfinger128px.png
similarity index 100%
rename from script-archive/fingerPaint/content/tabicons/pointingfinger128px.png
rename to scripts/system/fingerPaint/content/tabicons/pointingfinger128px.png
diff --git a/script-archive/fingerPaint/fingerPaint.js b/scripts/system/fingerPaint/fingerPaint.js
similarity index 100%
rename from script-archive/fingerPaint/fingerPaint.js
rename to scripts/system/fingerPaint/fingerPaint.js