learnforpractice
diff --git a/‎.gitmodules
Lines changed: 3 additions & 4 deletions b/‎.gitmodules
Lines changed: 3 additions & 4 deletions
diff --git a/‎libraries/CMakeLists.txt
Lines changed: 1 addition & 5 deletions b/‎libraries/CMakeLists.txt
Lines changed: 1 addition & 5 deletions
diff --git a/‎libraries/chain/CMakeLists.txt
Lines changed: 6 additions & 6 deletions b/‎libraries/chain/CMakeLists.txt
Lines changed: 6 additions & 6 deletions
diff --git a/‎libraries/vm/CMakeLists.txt
Lines changed: 4 additions & 0 deletions b/‎libraries/vm/CMakeLists.txt
Lines changed: 4 additions & 0 deletions
diff --git a/‎libraries/vm_api_rpc/CMakeLists.txt renamed to ‎libraries/vm/vm_api_rpc/CMakeLists.txt b/‎libraries/vm_api_rpc/CMakeLists.txt renamed to ‎libraries/vm/vm_api_rpc/CMakeLists.txt
diff --git a/‎libraries/vm_api_rpc/action.cpp renamed to ‎libraries/vm/vm_api_rpc/action.cpp b/‎libraries/vm_api_rpc/action.cpp renamed to ‎libraries/vm/vm_api_rpc/action.cpp
diff --git a/‎libraries/vm_api_rpc/chain.cpp renamed to ‎libraries/vm/vm_api_rpc/chain.cpp b/‎libraries/vm_api_rpc/chain.cpp renamed to ‎libraries/vm/vm_api_rpc/chain.cpp
diff --git a/‎libraries/vm_api_rpc/cpp/RpcInterface.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcInterface.cpp b/‎libraries/vm_api_rpc/cpp/RpcInterface.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcInterface.cpp
diff --git a/‎libraries/vm_api_rpc/cpp/RpcInterface.h renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcInterface.h b/‎libraries/vm_api_rpc/cpp/RpcInterface.h renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcInterface.h
diff --git a/‎libraries/vm_api_rpc/cpp/RpcInterface_server.skeleton.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcInterface_server.skeleton.cpp b/‎libraries/vm_api_rpc/cpp/RpcInterface_server.skeleton.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcInterface_server.skeleton.cpp
diff --git a/‎libraries/vm_api_rpc/cpp/RpcService.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService.cpp b/‎libraries/vm_api_rpc/cpp/RpcService.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService.cpp
diff --git a/‎libraries/vm_api_rpc/cpp/RpcService.h renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService.h b/‎libraries/vm_api_rpc/cpp/RpcService.h renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService.h
diff --git a/‎libraries/vm_api_rpc/cpp/RpcService_constants.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService_constants.cpp b/‎libraries/vm_api_rpc/cpp/RpcService_constants.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService_constants.cpp
diff --git a/‎libraries/vm_api_rpc/cpp/RpcService_constants.h renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService_constants.h b/‎libraries/vm_api_rpc/cpp/RpcService_constants.h renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService_constants.h
diff --git a/‎libraries/vm_api_rpc/cpp/RpcService_types.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService_types.cpp b/‎libraries/vm_api_rpc/cpp/RpcService_types.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService_types.cpp
diff --git a/‎libraries/vm_api_rpc/cpp/RpcService_types.h renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService_types.h b/‎libraries/vm_api_rpc/cpp/RpcService_types.h renamed to ‎libraries/vm/vm_api_rpc/cpp/RpcService_types.h
diff --git a/‎libraries/vm_api_rpc/cpp/atomicops.h renamed to ‎libraries/vm/vm_api_rpc/cpp/atomicops.h b/‎libraries/vm_api_rpc/cpp/atomicops.h renamed to ‎libraries/vm/vm_api_rpc/cpp/atomicops.h
diff --git a/‎libraries/vm_api_rpc/cpp/blockingconcurrentqueue.h renamed to ‎libraries/vm/vm_api_rpc/cpp/blockingconcurrentqueue.h b/‎libraries/vm_api_rpc/cpp/blockingconcurrentqueue.h renamed to ‎libraries/vm/vm_api_rpc/cpp/blockingconcurrentqueue.h
diff --git a/‎libraries/vm_api_rpc/cpp/concurrentqueue.h renamed to ‎libraries/vm/vm_api_rpc/cpp/concurrentqueue.h b/‎libraries/vm_api_rpc/cpp/concurrentqueue.h renamed to ‎libraries/vm/vm_api_rpc/cpp/concurrentqueue.h
diff --git a/‎libraries/vm_api_rpc/cpp/readerwriterqueue.h renamed to ‎libraries/vm/vm_api_rpc/cpp/readerwriterqueue.h b/‎libraries/vm_api_rpc/cpp/readerwriterqueue.h renamed to ‎libraries/vm/vm_api_rpc/cpp/readerwriterqueue.h
diff --git a/‎libraries/vm_api_rpc/cpp/rpceoslib.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/rpceoslib.cpp b/‎libraries/vm_api_rpc/cpp/rpceoslib.cpp renamed to ‎libraries/vm/vm_api_rpc/cpp/rpceoslib.cpp
diff --git a/‎libraries/vm_api_rpc/cpp/rpceoslib.h renamed to ‎libraries/vm/vm_api_rpc/cpp/rpceoslib.h b/‎libraries/vm_api_rpc/cpp/rpceoslib.h renamed to ‎libraries/vm/vm_api_rpc/cpp/rpceoslib.h
diff --git a/‎libraries/vm_api_rpc/crypto.cpp renamed to ‎libraries/vm/vm_api_rpc/crypto.cpp b/‎libraries/vm_api_rpc/crypto.cpp renamed to ‎libraries/vm/vm_api_rpc/crypto.cpp
diff --git a/‎libraries/vm_api_rpc/db.cpp renamed to ‎libraries/vm/vm_api_rpc/db.cpp b/‎libraries/vm_api_rpc/db.cpp renamed to ‎libraries/vm/vm_api_rpc/db.cpp
diff --git a/‎libraries/vm_api_rpc/eosiolib.cpp renamed to ‎libraries/vm/vm_api_rpc/eosiolib.cpp b/‎libraries/vm_api_rpc/eosiolib.cpp renamed to ‎libraries/vm/vm_api_rpc/eosiolib.cpp
diff --git a/‎libraries/vm_api_rpc/memory.cpp renamed to ‎libraries/vm/vm_api_rpc/memory.cpp b/‎libraries/vm_api_rpc/memory.cpp renamed to ‎libraries/vm/vm_api_rpc/memory.cpp
diff --git a/‎libraries/vm_api_rpc/permission.cpp renamed to ‎libraries/vm/vm_api_rpc/permission.cpp b/‎libraries/vm_api_rpc/permission.cpp renamed to ‎libraries/vm/vm_api_rpc/permission.cpp
diff --git a/‎libraries/vm_api_rpc/print.cpp renamed to ‎libraries/vm/vm_api_rpc/print.cpp b/‎libraries/vm_api_rpc/print.cpp renamed to ‎libraries/vm/vm_api_rpc/print.cpp
diff --git a/‎libraries/vm_api_rpc/privileged.cpp renamed to ‎libraries/vm/vm_api_rpc/privileged.cpp b/‎libraries/vm_api_rpc/privileged.cpp renamed to ‎libraries/vm/vm_api_rpc/privileged.cpp
diff --git a/‎libraries/vm_api_rpc/rpc_interface.cpp renamed to ‎libraries/vm/vm_api_rpc/rpc_interface.cpp b/‎libraries/vm_api_rpc/rpc_interface.cpp renamed to ‎libraries/vm/vm_api_rpc/rpc_interface.cpp
diff --git a/‎libraries/vm_api_rpc/rpc_interface.hpp renamed to ‎libraries/vm/vm_api_rpc/rpc_interface.hpp b/‎libraries/vm_api_rpc/rpc_interface.hpp renamed to ‎libraries/vm/vm_api_rpc/rpc_interface.hpp
diff --git a/‎libraries/vm_api_rpc/rpc_interface_.pyx renamed to ‎libraries/vm/vm_api_rpc/rpc_interface_.pyx b/‎libraries/vm_api_rpc/rpc_interface_.pyx renamed to ‎libraries/vm/vm_api_rpc/rpc_interface_.pyx
diff --git a/‎libraries/vm_api_rpc/system.cpp renamed to ‎libraries/vm/vm_api_rpc/system.cpp b/‎libraries/vm_api_rpc/system.cpp renamed to ‎libraries/vm/vm_api_rpc/system.cpp
diff --git a/‎libraries/vm_api_rpc/transaction.cpp renamed to ‎libraries/vm/vm_api_rpc/transaction.cpp b/‎libraries/vm_api_rpc/transaction.cpp renamed to ‎libraries/vm/vm_api_rpc/transaction.cpp
diff --git a/‎libraries/vm_api_rpc/vm_api.cpp renamed to ‎libraries/vm/vm_api_rpc/vm_api.cpp b/‎libraries/vm_api_rpc/vm_api.cpp renamed to ‎libraries/vm/vm_api_rpc/vm_api.cpp
diff --git a/‎libraries/vm_eth/CMakeLists.txt renamed to ‎libraries/vm/vm_eth/CMakeLists.txt b/‎libraries/vm_eth/CMakeLists.txt renamed to ‎libraries/vm/vm_eth/CMakeLists.txt
diff --git a/‎libraries/vm_eth/EosAccount.cpp renamed to ‎libraries/vm/vm_eth/EosAccount.cpp b/‎libraries/vm_eth/EosAccount.cpp renamed to ‎libraries/vm/vm_eth/EosAccount.cpp
diff --git a/‎libraries/vm_eth/EosAccount.h renamed to ‎libraries/vm/vm_eth/EosAccount.h b/‎libraries/vm_eth/EosAccount.h renamed to ‎libraries/vm/vm_eth/EosAccount.h
diff --git a/‎libraries/vm_eth/EosDB.cpp renamed to ‎libraries/vm/vm_eth/EosDB.cpp b/‎libraries/vm_eth/EosDB.cpp renamed to ‎libraries/vm/vm_eth/EosDB.cpp
diff --git a/‎libraries/vm_eth/EosDB.h renamed to ‎libraries/vm/vm_eth/EosDB.h b/‎libraries/vm_eth/EosDB.h renamed to ‎libraries/vm/vm_eth/EosDB.h
diff --git a/‎libraries/vm_eth/EosExecutive.cpp renamed to ‎libraries/vm/vm_eth/EosExecutive.cpp b/‎libraries/vm_eth/EosExecutive.cpp renamed to ‎libraries/vm/vm_eth/EosExecutive.cpp
diff --git a/‎libraries/vm_eth/EosExecutive.h renamed to ‎libraries/vm/vm_eth/EosExecutive.h b/‎libraries/vm_eth/EosExecutive.h renamed to ‎libraries/vm/vm_eth/EosExecutive.h
diff --git a/‎libraries/vm_eth/EosExtVM.cpp renamed to ‎libraries/vm/vm_eth/EosExtVM.cpp b/‎libraries/vm_eth/EosExtVM.cpp renamed to ‎libraries/vm/vm_eth/EosExtVM.cpp
diff --git a/‎libraries/vm_eth/EosExtVM.h renamed to ‎libraries/vm/vm_eth/EosExtVM.h b/‎libraries/vm_eth/EosExtVM.h renamed to ‎libraries/vm/vm_eth/EosExtVM.h
diff --git a/‎libraries/vm_eth/EosState.cpp renamed to ‎libraries/vm/vm_eth/EosState.cpp b/‎libraries/vm_eth/EosState.cpp renamed to ‎libraries/vm/vm_eth/EosState.cpp
diff --git a/‎libraries/vm_eth/EosState.h renamed to ‎libraries/vm/vm_eth/EosState.h b/‎libraries/vm_eth/EosState.h renamed to ‎libraries/vm/vm_eth/EosState.h
diff --git a/‎libraries/vm_eth/evm_interface.cpp renamed to ‎libraries/vm/vm_eth/evm_interface.cpp b/‎libraries/vm_eth/evm_interface.cpp renamed to ‎libraries/vm/vm_eth/evm_interface.cpp
diff --git a/‎libraries/vm_eth/vm_eth.cpp renamed to ‎libraries/vm/vm_eth/vm_eth.cpp b/‎libraries/vm_eth/vm_eth.cpp renamed to ‎libraries/vm/vm_eth/vm_eth.cpp
diff --git a/‎libraries/vm_native/CMakeLists.txt renamed to ‎libraries/vm/vm_native/CMakeLists.txt b/‎libraries/vm_native/CMakeLists.txt renamed to ‎libraries/vm/vm_native/CMakeLists.txt
diff --git a/‎libraries/vm_native/native_interface.cpp renamed to ‎libraries/vm/vm_native/native_interface.cpp b/‎libraries/vm_native/native_interface.cpp renamed to ‎libraries/vm/vm_native/native_interface.cpp
diff --git a/‎libraries/vm_native/native_interface.hpp renamed to ‎libraries/vm/vm_native/native_interface.hpp b/‎libraries/vm_native/native_interface.hpp renamed to ‎libraries/vm/vm_native/native_interface.hpp
diff --git a/‎libraries/vm_native/vm_native.cpp renamed to ‎libraries/vm/vm_native/vm_native.cpp b/‎libraries/vm_native/vm_native.cpp renamed to ‎libraries/vm/vm_native/vm_native.cpp
diff --git a/‎libraries/vm/vm_py b/‎libraries/vm/vm_py
diff --git a/‎libraries/vm_wasm/CMakeLists.txt renamed to ‎libraries/vm/vm_wasm/CMakeLists.txt
Lines changed: 2 additions & 2 deletions b/‎libraries/vm_wasm/CMakeLists.txt renamed to ‎libraries/vm/vm_wasm/CMakeLists.txt
Lines changed: 2 additions & 2 deletions
diff --git a/‎libraries/vm_wasm/binaryen.cpp renamed to ‎libraries/vm/vm_wasm/binaryen.cpp b/‎libraries/vm_wasm/binaryen.cpp renamed to ‎libraries/vm/vm_wasm/binaryen.cpp
diff --git a/‎libraries/vm_wasm/include/eosio/chain/wasm_interface.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/wasm_interface.hpp b/‎libraries/vm_wasm/include/eosio/chain/wasm_interface.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/wasm_interface.hpp
diff --git a/‎libraries/vm_wasm/include/eosio/chain/wasm_interface_private.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/wasm_interface_private.hpp b/‎libraries/vm_wasm/include/eosio/chain/wasm_interface_private.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/wasm_interface_private.hpp
diff --git a/‎libraries/vm_wasm/include/eosio/chain/webassembly/binaryen.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/webassembly/binaryen.hpp b/‎libraries/vm_wasm/include/eosio/chain/webassembly/binaryen.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/webassembly/binaryen.hpp
diff --git a/‎libraries/vm_wasm/include/eosio/chain/webassembly/common.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/webassembly/common.hpp b/‎libraries/vm_wasm/include/eosio/chain/webassembly/common.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/webassembly/common.hpp
diff --git a/‎libraries/vm_wasm/include/eosio/chain/webassembly/runtime_interface.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/webassembly/runtime_interface.hpp b/‎libraries/vm_wasm/include/eosio/chain/webassembly/runtime_interface.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/webassembly/runtime_interface.hpp
diff --git a/‎libraries/vm_wasm/include/eosio/chain/webassembly/wavm.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/webassembly/wavm.hpp b/‎libraries/vm_wasm/include/eosio/chain/webassembly/wavm.hpp renamed to ‎libraries/vm/vm_wasm/include/eosio/chain/webassembly/wavm.hpp
diff --git a/‎libraries/vm_wasm/name.cpp renamed to ‎libraries/vm/vm_wasm/name.cpp b/‎libraries/vm_wasm/name.cpp renamed to ‎libraries/vm/vm_wasm/name.cpp
diff --git a/‎libraries/vm_wasm/symbols.list renamed to ‎libraries/vm/vm_wasm/symbols.list b/‎libraries/vm_wasm/symbols.list renamed to ‎libraries/vm/vm_wasm/symbols.list
diff --git a/‎libraries/vm_wasm/version.script renamed to ‎libraries/vm/vm_wasm/version.script b/‎libraries/vm_wasm/version.script renamed to ‎libraries/vm/vm_wasm/version.script
diff --git a/‎libraries/vm_wasm/vm_api.cpp renamed to ‎libraries/vm/vm_wasm/vm_api.cpp b/‎libraries/vm_wasm/vm_api.cpp renamed to ‎libraries/vm/vm_wasm/vm_api.cpp
diff --git a/‎libraries/vm_wasm/vm_wasm.cpp renamed to ‎libraries/vm/vm_wasm/vm_wasm.cpp b/‎libraries/vm_wasm/vm_wasm.cpp renamed to ‎libraries/vm/vm_wasm/vm_wasm.cpp
diff --git a/‎libraries/vm_wasm/vm_wasm_api.h renamed to ‎libraries/vm/vm_wasm/vm_wasm_api.h b/‎libraries/vm_wasm/vm_wasm_api.h renamed to ‎libraries/vm/vm_wasm/vm_wasm_api.h
diff --git a/‎libraries/vm_wasm/wasm_eosio_binary_ops.cpp renamed to ‎libraries/vm/vm_wasm/wasm_eosio_binary_ops.cpp b/‎libraries/vm_wasm/wasm_eosio_binary_ops.cpp renamed to ‎libraries/vm/vm_wasm/wasm_eosio_binary_ops.cpp
diff --git a/‎libraries/vm_wasm/wasm_eosio_injection.cpp renamed to ‎libraries/vm/vm_wasm/wasm_eosio_injection.cpp b/‎libraries/vm_wasm/wasm_eosio_injection.cpp renamed to ‎libraries/vm/vm_wasm/wasm_eosio_injection.cpp
diff --git a/‎libraries/vm_wasm/wasm_eosio_validation.cpp renamed to ‎libraries/vm/vm_wasm/wasm_eosio_validation.cpp b/‎libraries/vm_wasm/wasm_eosio_validation.cpp renamed to ‎libraries/vm/vm_wasm/wasm_eosio_validation.cpp
diff --git a/‎libraries/vm_wasm/wasm_interface.cpp renamed to ‎libraries/vm/vm_wasm/wasm_interface.cpp b/‎libraries/vm_wasm/wasm_interface.cpp renamed to ‎libraries/vm/vm_wasm/wasm_interface.cpp
diff --git a/‎libraries/vm_wasm/wast_to_wasm.cpp renamed to ‎libraries/vm/vm_wasm/wast_to_wasm.cpp b/‎libraries/vm_wasm/wast_to_wasm.cpp renamed to ‎libraries/vm/vm_wasm/wast_to_wasm.cpp
diff --git a/‎libraries/vm_wasm/wavm.cpp renamed to ‎libraries/vm/vm_wasm/wavm.cpp b/‎libraries/vm_wasm/wavm.cpp renamed to ‎libraries/vm/vm_wasm/wavm.cpp
diff --git a/‎libraries/vm_manager/CMakeLists.txt
Lines changed: 3 additions & 3 deletions b/‎libraries/vm_manager/CMakeLists.txt
Lines changed: 3 additions & 3 deletions
diff --git a/‎libraries/vm_py
Lines changed: 0 additions & 1 deletion b/‎libraries/vm_py
Lines changed: 0 additions & 1 deletion
@@ -9,10 +9,6 @@
        path = libraries/ethereum
        url = https://github.com/learnforpractice/cpp-ethereum
        branch = develop-eos
-[submodule "libraries/vm_py"]
-	path = libraries/vm_py
-	url = https://github.com/learnforpractice/micropython
-	branch = master
 [submodule "contracts/musl/upstream"]
 	path = contracts/musl/upstream
 	url = https://github.com/EOSIO/musl.git
@@ -49,3 +45,6 @@
 [submodule "cmake/polly"]
 	path = cmake/polly
 	url = https://github.com/learnforpractice/polly
+[submodule "libraries/vm/vm_py"]
+	path = libraries/vm/vm_py
+	url = https://github.com/learnforpractice/micropython
@@ -1,11 +1,7 @@
 add_subdirectory( python )
 #add_subdirectory( python-single-thread )
-add_subdirectory( vm_py )
-add_subdirectory( vm_wasm )
-add_subdirectory( vm_eth )
-add_subdirectory( vm_native )
 
-#add_subdirectory( vm_api_rpc )
+add_subdirectory( vm )
 
 add_subdirectory( ipc )
 
 
@@ -96,13 +96,13 @@ target_include_directories( eosio_chain
                             PUBLIC ${CMAKE_SOURCE_DIR}/libraries/python/Include
                             PUBLIC ${CMAKE_SOURCE_DIR}/libraries/python
                             PUBLIC ${CMAKE_SOURCE_DIR}/contracts
-                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm_py
-                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm_wasm
-                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm_py/py
                             PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm_manager
-                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm_py/extmod
-                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm_py/ports/unix
-                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm_py/ports/unix/build
+                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm/vm_py
+                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm/vm_wasm
+                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm/vm_py/py
+                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm/vm_py/extmod
+                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm/vm_py/ports/unix
+                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm/vm_py/ports/unix/build
                             PUBLIC ${CMAKE_SOURCE_DIR}/externals/thrift/src
                             PUBLIC ${CMAKE_SOURCE_DIR}/externals/magic_get/include
                             )
 
@@ -0,0 +1,4 @@
+add_subdirectory( vm_py )
+add_subdirectory( vm_wasm )
+add_subdirectory( vm_eth )
+add_subdirectory( vm_native )
@@ -3,8 +3,8 @@ set(HEADERS
     ${CMAKE_SOURCE_DIR}/libraries/wasm-jit/Include
     ${CMAKE_SOURCE_DIR}/contracts
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-    PUBLIC ${CMAKE_SOURCE_DIR}/libraries/chainbase/include
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../externals/binaryen/src" )
+    ${CMAKE_SOURCE_DIR}/libraries/chainbase/include
+    ${CMAKE_SOURCE_DIR}/externals/binaryen/src )
 
 
 #reference from https://github.com/BYVoid/uchardet/blob/master/src/symbols.cmake
 
@@ -17,9 +17,9 @@ target_include_directories( vm_manager
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../externals/binaryen/src"
                             PUBLIC ${CMAKE_SOURCE_DIR}/libraries/chain
                             PUBLIC ${CMAKE_SOURCE_DIR}/libraries/chain/include
-                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm_py
-                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm_wasm
-                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm_py/py
+                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm/vm_py
+                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm/vm_wasm
+                            PUBLIC ${CMAKE_SOURCE_DIR}/libraries/vm/vm_py/py
                             PUBLIC ${CMAKE_SOURCE_DIR}/contracts
                             PUBLIC ${CMAKE_SOURCE_DIR}/externals/magic_get/include
                             )