diff --git a/report_test_suite_coverage.sh b/report_test_suite_coverage.sh
index 5e7e52f..8e1010e 100755
--- a/report_test_suite_coverage.sh
+++ b/report_test_suite_coverage.sh
@@ -1,4 +1,3 @@
 make -B BUILD_MODE=COVERAGE CC=gcc
-./test tests/compiler/ tests/runtime/
-make report
-firefox report/index.html
\ No newline at end of file
+./test tests/
+make report
\ No newline at end of file
diff --git a/test_bytecode b/test_bytecode
deleted file mode 100755
index 8d78b09..0000000
Binary files a/test_bytecode and /dev/null differ
diff --git a/tests/runtime/tcase_010.noja-test b/tests/runtime/jumpifandpop/jumpifandpop.noja-test
similarity index 100%
rename from tests/runtime/tcase_010.noja-test
rename to tests/runtime/jumpifandpop/jumpifandpop.noja-test
diff --git a/tests/runtime/tcase_011.noja-test b/tests/runtime/jumpifandpop/jumpifandpop_2.noja-test
similarity index 100%
rename from tests/runtime/tcase_011.noja-test
rename to tests/runtime/jumpifandpop/jumpifandpop_2.noja-test
diff --git a/tests/runtime/tcase_008.noja-test b/tests/runtime/jumpifnotandpop/jumpifnotandpop.noja-test
similarity index 100%
rename from tests/runtime/tcase_008.noja-test
rename to tests/runtime/jumpifnotandpop/jumpifnotandpop.noja-test
diff --git a/tests/runtime/tcase_009.noja-test b/tests/runtime/jumpifnotandpop/jumpifnotandpop_2.noja-test
similarity index 100%
rename from tests/runtime/tcase_009.noja-test
rename to tests/runtime/jumpifnotandpop/jumpifnotandpop_2.noja-test
diff --git a/tests/runtime/tcase_013.noja-test b/tests/runtime/neg/neg.noja-test
similarity index 100%
rename from tests/runtime/tcase_013.noja-test
rename to tests/runtime/neg/neg.noja-test
diff --git a/tests/runtime/tcase_014.noja-test b/tests/runtime/neg/neg_2.noja-test
similarity index 100%
rename from tests/runtime/tcase_014.noja-test
rename to tests/runtime/neg/neg_2.noja-test
diff --git a/tests/runtime/tcase_015.noja-test b/tests/runtime/neg/neg_3.noja-test
similarity index 100%
rename from tests/runtime/tcase_015.noja-test
rename to tests/runtime/neg/neg_3.noja-test
diff --git a/tests/runtime/tcase_016.noja-test b/tests/runtime/neg/neg_4.noja-test
similarity index 100%
rename from tests/runtime/tcase_016.noja-test
rename to tests/runtime/neg/neg_4.noja-test
diff --git a/tests/runtime/tcase_017.noja-test b/tests/runtime/not/not.noja-test
similarity index 100%
rename from tests/runtime/tcase_017.noja-test
rename to tests/runtime/not/not.noja-test
diff --git a/tests/runtime/tcase_018.noja-test b/tests/runtime/not/not_2.noja-test
similarity index 100%
rename from tests/runtime/tcase_018.noja-test
rename to tests/runtime/not/not_2.noja-test
diff --git a/tests/runtime/tcase_012.noja-test b/tests/runtime/pos/pos.noja-test
similarity index 100%
rename from tests/runtime/tcase_012.noja-test
rename to tests/runtime/pos/pos.noja-test
diff --git a/tests/runtime/tcase_002.noja-test b/tests/runtime/push/pushfls.noja-test
similarity index 100%
rename from tests/runtime/tcase_002.noja-test
rename to tests/runtime/push/pushfls.noja-test
diff --git a/tests/runtime/tcase_004.noja-test b/tests/runtime/push/pushflt.noja-test
similarity index 100%
rename from tests/runtime/tcase_004.noja-test
rename to tests/runtime/push/pushflt.noja-test
diff --git a/tests/runtime/tcase_003.noja-test b/tests/runtime/push/pushint.noja-test
similarity index 100%
rename from tests/runtime/tcase_003.noja-test
rename to tests/runtime/push/pushint.noja-test
diff --git a/tests/runtime/tcase_005.noja-test b/tests/runtime/push/pushlst.noja-test
similarity index 100%
rename from tests/runtime/tcase_005.noja-test
rename to tests/runtime/push/pushlst.noja-test
diff --git a/tests/runtime/tcase_000.noja-test b/tests/runtime/push/pushnne.noja-test
similarity index 100%
rename from tests/runtime/tcase_000.noja-test
rename to tests/runtime/push/pushnne.noja-test
diff --git a/tests/runtime/tcase_006.noja-test b/tests/runtime/push/pushnnetyp.noja-test
similarity index 100%
rename from tests/runtime/tcase_006.noja-test
rename to tests/runtime/push/pushnnetyp.noja-test
diff --git a/tests/runtime/tcase_001.noja-test b/tests/runtime/push/pushtru.noja-test
similarity index 100%
rename from tests/runtime/tcase_001.noja-test
rename to tests/runtime/push/pushtru.noja-test
diff --git a/tests/runtime/tcase_007.noja-test b/tests/runtime/push/pushtyp.noja-test
similarity index 100%
rename from tests/runtime/tcase_007.noja-test
rename to tests/runtime/push/pushtyp.noja-test