diff --git a/api/generate.sh b/api/generate.sh
index 0881690..fd0085d 100755
--- a/api/generate.sh
+++ b/api/generate.sh
@@ -18,12 +18,21 @@
 set -e
 g++ Generator.cpp Specification.cpp GenerateHtmlDocumentation.cpp GenerateHeaderFiles.cpp GenerateTestFiles.cpp Scanner.cpp Utilities.cpp -g -std=c++11 -Wall -o generator
 
+mkdir -p test
+mkdir -p scriptc
+mkdir -p html
+
 ./generator rs_allocation.spec rs_atomic.spec rs_core_math.spec rs_core.spec rs_debug.spec rs_element.spec rs_graphics.spec rs_math.spec rs_matrix.spec rs_mesh.spec rs_object.spec rs_program.spec rs_quaternion.spec rs_sampler.spec rs_time.spec rs_types.spec
 
-rm ../../../cts/tests/tests/renderscript/src/android/renderscript/cts/GeneratedTest*
-mv GeneratedTest* ../../../cts/tests/tests/renderscript/src/android/renderscript/cts/
+rm -f ../../../cts/tests/tests/renderscript/src/android/renderscript/cts/generated/*
+mv test/* ../../../cts/tests/tests/renderscript/src/android/renderscript/cts/generated/
+rmdir test
 
-mv *.rsh ../scriptc
+mv scriptc/*.rsh ../scriptc
+rmdir scriptc
 
-rm *.html # TODO handle the documentation files.
+# TODO handle the documentation files.
+rm html/*
+rmdir html
+
 rm generator