diff --git a/erlang_js b/erlang_js
index 5350ed2..709b568 160000
--- a/erlang_js
+++ b/erlang_js
@@ -1 +1 @@
-Subproject commit 5350ed21606606dbee5ecb07e974f2abb9106270
+Subproject commit 709b568efbc99c954507d1593bc5633f900bc5dc
diff --git a/src/ggs_db.hrl b/src/ggs_db.hrl
deleted file mode 100644
index b7f1f4c..0000000
--- a/src/ggs_db.hrl
+++ /dev/null
@@ -1,5 +0,0 @@
-%% gamedb.hrl
-
--record(data, {key, value}).
-
-
diff --git a/tests/ggs_gamevm_test.erl b/tests/ggs_gamevm_test.erl
index 1689dd1..3560fb9 100644
--- a/tests/ggs_gamevm_test.erl
+++ b/tests/ggs_gamevm_test.erl
@@ -3,28 +3,28 @@
 
 start_link_test() ->
     erlang_js:start(), %% @TODO: should only be done once
-	GameVM = start_link(test_table),
+	GameVM = ggs_gamevm:start_link(test_table),
 	?assertNot(GameVM =:= undefined).
 	
 define_test() ->
-    GameVM = start_link(test_table),
-    define(GameVM, "function hello(test) { return test; }"),
+    GameVM = ggs_gamevm:start_link(test_table),
+    ggs_gamevm:define(GameVM, "function hello(test) { return test; }"),
     ?assertMatch(<<"jeena">>, gen_server:call(GameVM, {eval, "hello('jeena')"})).
     
 stop_test() ->
-	GameVM = start_link(test_table),
-	ok = stop(GameVM).
+	GameVM = ggs_gamevm:start_link(test_table),
+	ok = ggs_gamevm:stop(GameVM).
 
 user_command_test() ->
-    GameVM = start_link(test_table),
-    define(GameVM, "var t = '';\nfunction userCommand(user, command, args) { t = user + command + args; }\n"),
-    user_command(GameVM, "'jeena", "thecommand", "theargs'"),
+    GameVM = ggs_gamevm:start_link(test_table),
+    ggs_gamevm:define(GameVM, "var t = '';\nfunction userCommand(user, command, args) { t = user + command + args; }\n"),
+    ggs_gamevm:user_command(GameVM, "'jeena", "thecommand", "theargs'"),
     ?assertMatch(<<"'jeenathecommandtheargs'">>, gen_server:call(GameVM, {eval, "t;"})).
 
 js_erlang_test() ->
-    GameVM = start_link(test_table),
-    define(GameVM, "var t = '';\nfunction userCommand(user, command, args) { t = callErlang('erlang time') + ''; }\n"),
-    user_command(GameVM, "", "", ""),
+    GameVM = ggs_gamevm:start_link(test_table),
+    ggs_gamevm:define(GameVM, "var t = '';\nfunction userCommand(user, command, args) { t = callErlang('erlang time') + ''; }\n"),
+    ggs_gamevm:user_command(GameVM, "", "", ""),
 	{A, B, C} = erlang:time(),
 	T = "{" ++ integer_to_list(A) ++ ", " ++ integer_to_list(B) ++ ", " ++ integer_to_list(C) ++ "}",
 	?assertMatch(T, binary_to_list(gen_server:call(GameVM, {eval, "t;"}))).