diff --git a/samples/camera-fitter/main.lua b/samples/camera-fitter/main.lua
index 3235da659e..c990740a23 100644
--- a/samples/camera-fitter/main.lua
+++ b/samples/camera-fitter/main.lua
@@ -10,7 +10,7 @@ viewport = MOAIViewport.new ()
 viewport:setSize ( 320, 480 )
 viewport:setScale ( 320, 480 )
 
-camera = MOAICamera2D.new ()
+camera = MOAICamera.new ()
 
 layer = MOAIPartitionViewLayer.new ()
 layer:setViewport ( viewport )
@@ -24,13 +24,13 @@ fitter:setBounds ( -1000, -64, 1000, 10000 )
 fitter:setMin ( 256 )
 fitter:start ()
 
-gfxQuad = MOAIGfxQuad2D.new ()
-gfxQuad:setTexture ( "moai.png" )
-gfxQuad:setRect ( -64, -64, 64, 64 )
+spriteDeck = MOAISpriteDeck2D.new ()
+spriteDeck:setTexture ( '../resources/moai.png' )
+spriteDeck:setRect ( -64, -64, 64, 64 )
 
 prop = MOAIProp.new ()
-prop:setDeck ( gfxQuad )
-prop:moveLoc ( 256, 0, 3 )
+prop:setDeck ( spriteDeck )
+prop:moveLoc ( 256, 0, 0, 3 )
 prop:setPartition ( layer )
 
 anchor = MOAICameraAnchor2D.new ()
@@ -39,8 +39,8 @@ anchor:setRect ( -64, -64, 64, 64 )
 fitter:insertAnchor ( anchor )
 
 prop = MOAIProp.new ()
-prop:setDeck ( gfxQuad )
-prop:moveLoc ( -256, 0, 3 )
+prop:setDeck ( spriteDeck )
+prop:moveLoc ( -256, 0, 0, 3 )
 prop:setPartition ( layer )
 
 anchor = MOAICameraAnchor2D.new ()
diff --git a/samples/camera-fitter/moai.png b/samples/camera-fitter/moai.png
deleted file mode 100644
index 8a9974bd65..0000000000
Binary files a/samples/camera-fitter/moai.png and /dev/null differ
diff --git a/samples/camera-fitter/run.bat b/samples/camera-fitter/run.bat
deleted file mode 100644
index d5fad5e750..0000000000
--- a/samples/camera-fitter/run.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-::----------------------------------------------------------------::
-:: Copyright (c) 2010-2017 Zipline Games, Inc.
-:: All Rights Reserved.
-:: http://getmoai.com
-::----------------------------------------------------------------::
-
-@echo off
-
-:: verify paths
-if not exist "%MOAI_BIN%\moai.exe" (
-	echo.
-	echo --------------------------------------------------------------------------------
-	echo ERROR: The MOAI_BIN environment variable either doesn't exist or it's pointing
-	echo to an invalid path. Please point it at a folder containing moai.exe.
-	echo --------------------------------------------------------------------------------
-	echo.
-	goto end
-)
-
-:: run moai
-"%MOAI_BIN%\moai" "main.lua"
-
-:end
-pause
\ No newline at end of file
diff --git a/samples/camera-fitter/run.sh b/samples/camera-fitter/run.sh
deleted file mode 100755
index 612def2f86..0000000000
--- a/samples/camera-fitter/run.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#--------------------------------------------------------------------------------------
-# Copyright (c) 2010-2013 Zipline Games, Inc.
-# All Rights Reserved.
-# http://getmoai.com
-#--------------------------------------------------------------------------------------
-
-cd `dirname $0`
-
-# Verify paths
-if [ ! -f "$MOAI_BIN/moai" ]; then
-    echo "---------------------------------------------------------------------------"
-    echo "Error: The MOAI_BIN environment variable doesn't exist or its pointing to an"
-    echo "invalid path.  Please point it at a folder containing moai executable"
-    echo "---------------------------------------------------------------------------"
-    exit 1
-fi
-
-# Run moai
-$MOAI_BIN/moai main.lua