diff --git a/blockgenesistest.json b/BasicTests/blockgenesistest.json
similarity index 100%
rename from blockgenesistest.json
rename to BasicTests/blockgenesistest.json
diff --git a/genesishashestest.json b/BasicTests/genesishashestest.json
similarity index 100%
rename from genesishashestest.json
rename to BasicTests/genesishashestest.json
diff --git a/hexencodetest.json b/BasicTests/hexencodetest.json
similarity index 100%
rename from hexencodetest.json
rename to BasicTests/hexencodetest.json
diff --git a/keyaddrtest.json b/BasicTests/keyaddrtest.json
similarity index 100%
rename from keyaddrtest.json
rename to BasicTests/keyaddrtest.json
diff --git a/rlptest.json b/BasicTests/rlptest.json
similarity index 100%
rename from rlptest.json
rename to BasicTests/rlptest.json
diff --git a/txtest.json b/BasicTests/txtest.json
similarity index 100%
rename from txtest.json
rename to BasicTests/txtest.json
diff --git a/trietest.json b/TrieTests/trietest.json
similarity index 100%
rename from trietest.json
rename to TrieTests/trietest.json
diff --git a/trietestnextprev.json b/TrieTests/trietestnextprev.json
similarity index 100%
rename from trietestnextprev.json
rename to TrieTests/trietestnextprev.json
diff --git a/vmtests/vmArithmeticTest.json b/VMTests/vmArithmeticTest.json
similarity index 99%
rename from vmtests/vmArithmeticTest.json
rename to VMTests/vmArithmeticTest.json
index 7166016d8..0bb8322b1 100644
--- a/vmtests/vmArithmeticTest.json
+++ b/VMTests/vmArithmeticTest.json
@@ -3237,4 +3237,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/vmtests/vmBitwiseLogicOperationTest.json b/VMTests/vmBitwiseLogicOperationTest.json
similarity index 100%
rename from vmtests/vmBitwiseLogicOperationTest.json
rename to VMTests/vmBitwiseLogicOperationTest.json
diff --git a/vmtests/vmBlockInfoTest.json b/VMTests/vmBlockInfoTest.json
similarity index 100%
rename from vmtests/vmBlockInfoTest.json
rename to VMTests/vmBlockInfoTest.json
diff --git a/vmtests/vmEnvironmentalInfoTest.json b/VMTests/vmEnvironmentalInfoTest.json
similarity index 100%
rename from vmtests/vmEnvironmentalInfoTest.json
rename to VMTests/vmEnvironmentalInfoTest.json
diff --git a/vmtests/vmIOandFlowOperationsTest.json b/VMTests/vmIOandFlowOperationsTest.json
similarity index 100%
rename from vmtests/vmIOandFlowOperationsTest.json
rename to VMTests/vmIOandFlowOperationsTest.json
diff --git a/namecoin.json b/VMTests/vmNamecoin.json
similarity index 100%
rename from namecoin.json
rename to VMTests/vmNamecoin.json
diff --git a/vmtests/vmPushDupSwapTest.json b/VMTests/vmPushDupSwapTest.json
similarity index 100%
rename from vmtests/vmPushDupSwapTest.json
rename to VMTests/vmPushDupSwapTest.json
diff --git a/vmtests/vmSha3Test.json b/VMTests/vmSha3Test.json
similarity index 100%
rename from vmtests/vmSha3Test.json
rename to VMTests/vmSha3Test.json
diff --git a/vmtests/vmSystemOperationsTest.json b/VMTests/vmSystemOperationsTest.json
similarity index 100%
rename from vmtests/vmSystemOperationsTest.json
rename to VMTests/vmSystemOperationsTest.json
diff --git a/vmtests/vmtests.json b/VMTests/vmtests.json
similarity index 100%
rename from vmtests/vmtests.json
rename to VMTests/vmtests.json
diff --git a/vmtests/random.json b/vmtests/random.json
deleted file mode 100644
index 76248c85e..000000000
--- a/vmtests/random.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-    "random": {
-        "pre": {
-            "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": {
-                "nonce": "0", 
-                "balance": "1", 
-                "storage": {}, 
-                "code": "0x"
-            }, 
-            "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                "nonce": "0", 
-                "balance": "2500000000000000000", 
-                "storage": {}, 
-                "code": "0x"
-            }
-        }, 
-        "exec": {
-            "origin": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1", 
-            "code": "0x60f86363f011b260c16324413d44608e633688a34a6043637657ab003809060b0cff0aff00070f413041f234344542020f0043393104590c09325c13383458f137f0600845f205300a0d36030b35402011393635395454593a015940", 
-            "value": "0", 
-            "address": "7d577a597b2742b498cb5cf0c26cdcd726d39e6e", 
-            "gas": "10000", 
-            "caller": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1", 
-            "data": "0x604e63f12f6b0c60426319bcb28060986330a233e8604463265e809d0104600a3af0f10ff10d0c1336114408583a33f05135410160540f524057201313440d585513f25c54115c433a0d37045a5212094109f10108125c35100f535a", 
-            "gasPrice": "1000000000000"
-        }, 
-        "callcreates": [], 
-        "gas": "9987", 
-        "env": {
-            "currentTimestamp": "1405320512", 
-            "currentGasLimit": "999023", 
-            "previousHash": "112a6e7995fcb66376f44e52f011c38d328a9ed3a1dac6eebb1376fccd055fad", 
-            "currentCoinbase": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1", 
-            "currentDifficulty": "4190208", 
-            "currentNumber": "1"
-        }, 
-        "post": {
-            "0000000000000000000000000000000000000001": {
-                "nonce": "0", 
-                "balance": "1", 
-                "storage": {}, 
-                "code": "0x"
-            }, 
-            "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": {
-                "nonce": "0", 
-                "balance": "0", 
-                "storage": {}, 
-                "code": "0x"
-            }, 
-            "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                "nonce": "0", 
-                "balance": "2500000000000000000", 
-                "storage": {}, 
-                "code": "0x"
-            }
-        }, 
-        "out": "0x"
-    }
-}
diff --git a/vmtests/tmp.json b/vmtests/tmp.json
deleted file mode 100644
index e69de29bb..000000000