diff --git a/buildtools/build.sh b/buildtools/build.sh
index 46e1524..e1658ef 100755
--- a/buildtools/build.sh
+++ b/buildtools/build.sh
@@ -26,5 +26,9 @@ fi
 
 popd
 
+./instrumentation.sh
+
+cp ../bin/activejdbc_models.properties ../build/
+
 exit $EXIT_SUCCESS
 
diff --git a/instrumentation.sh b/buildtools/instrumentation.sh
similarity index 70%
rename from instrumentation.sh
rename to buildtools/instrumentation.sh
index 07e2de1..b70478b 100755
--- a/instrumentation.sh
+++ b/buildtools/instrumentation.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 
+pushd ../
+
 if test "$1" = ""; then
 	export CLASSPATH="bin"
 
-	for file in $(ls libs); do 
-		export CLASSPATH=$CLASSPATH:libs/$file
+	for file in $(ls build/NurseBot_lib); do 
+		export CLASSPATH=$CLASSPATH:build/NurseBot_lib/$file
 	done
 
 	java -cp $CLASSPATH -DoutputDirectory=bin org.javalite.instrumentation.Main