From 029887022df26f59070a87fe9c646e74c4987ccc Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 15:54:04 -0800
Subject: [PATCH 01/13] [PR 128] CMake: Fix error including generated protobuf
 headers

Error was:

| CMake Error in core/storage/ipld/CMakeLists.txt:
|   Target "ipld_node_protobuf"
|   INTERFACE_INCLUDE_DIRECTORIES property contains path:
|
|     "build/core/storage/ipld"
|
|   which is prefixed in the build directory.
---
 core/storage/ipld/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/storage/ipld/CMakeLists.txt b/core/storage/ipld/CMakeLists.txt
index 37e4fbcbf8..b56340c59c 100644
--- a/core/storage/ipld/CMakeLists.txt
+++ b/core/storage/ipld/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(ipld_node_protobuf
     ${PB_BUILD_DIR}/ipld_node.pb.h
     ${PB_BUILD_DIR}/ipld_node.pb.cc
     )
-target_include_directories(ipld_node_protobuf PUBLIC ${PB_BUILD_DIR})
+target_include_directories(ipld_node_protobuf PUBLIC $<BUILD_INTERFACE:${PB_BUILD_DIR}>)
 target_link_libraries(ipld_node_protobuf
     protobuf::libprotobuf
     )

From 77746060aaf0e3e760263ff7aff47ce59bbc9179 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 15:54:00 -0800
Subject: [PATCH 02/13] [PR 128] CMake: Fix error locating protobuf without
 Hunter

When protobuf is provided by other build systems, it may require discovery
using a Findprotobuf.cmake module instead of the config file. By removing
'CONFIG', we allow CMake to choose.

Error was:

| CMake Error at cmake/dependencies.cmake:18 (find_package):
|   Could not find a package configuration file provided by "Protobuf" with any
|   of the following names:
|
|     ProtobufConfig.cmake
|     protobuf-config.cmake
---
 cmake/dependencies.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 98d8e174e6..dfcd63742d 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -20,7 +20,7 @@ find_package(OpenSSL REQUIRED)
 
 # https://developers.google.com/protocol-buffers/
 hunter_add_package(Protobuf)
-find_package(Protobuf CONFIG REQUIRED)
+find_package(Protobuf REQUIRED)
 
 # https://docs.hunter.sh/en/latest/packages/pkg/spdlog.html
  hunter_add_package(spdlog)

From e2457f981f6e38f29d7e202fa1d91790a090b6d5 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 18:35:06 -0800
Subject: [PATCH 03/13] [PR 128] CMake: Fix error locating GSL when building
 without Hunter

Error was:

| CMake Error at cmake/dependencies.cmake:22 (find_package):
|   By not providing "FindMicrosoft.GSL.cmake" in CMAKE_MODULE_PATH this
|   project has asked CMake to find a package configuration file provided by
|   "Microsoft.GSL", but CMake did not find one.
|
|   Could not find a package configuration file provided by "Microsoft.GSL"
|   with any of the following names:
|
|     Microsoft.GSLConfig.cmake
|     microsoft.gsl-config.cmake
---
 cmake/dependencies.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index dfcd63742d..73a315b6a5 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -12,7 +12,6 @@ find_package(Boost CONFIG REQUIRED date_time filesystem random system)
 
 # https://docs.hunter.sh/en/latest/packages/pkg/Microsoft.GSL.html
 hunter_add_package(Microsoft.GSL)
-find_package(Microsoft.GSL CONFIG REQUIRED)
 
 # https://www.openssl.org/
 hunter_add_package(OpenSSL)

From 16d513a4c38db3720cf46f32f60959a49428b2c6 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 15:54:03 -0800
Subject: [PATCH 04/13] [PR 128] CMake: Fix BLS signature library dependence on
 $HOME

Instead, allow the build system to provide Cargo, and rely on the build
system to set the PATH appropriately.

We could possibly keep the error message if cargo is not found, but I
believe the error output of add_custom_target() will be useful enough if
cargo is missing.
---
 deps/bls-signatures.cmake | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/deps/bls-signatures.cmake b/deps/bls-signatures.cmake
index aac8d677fd..2aabcb06df 100644
--- a/deps/bls-signatures.cmake
+++ b/deps/bls-signatures.cmake
@@ -3,17 +3,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(EXISTS "$ENV{HOME}/.cargo/bin/cargo")
-  message(STATUS "Rust cargo is present")
-else()
-  message(STATUS "No Rust cargo found")
-  message(WARNING
-          "Rust is required for building BLS dependencies.\n"
-          "You can install rust-lang via the following command:\n"
-          "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh"
-  )
-endif()
-
 set(BUILD_TYPE "release")
 
 set(BLS_BUILD_PATH
@@ -27,7 +16,7 @@ set(BLS_LIBRARY
 add_custom_target(
     cargo_build
     ALL
-    COMMAND $ENV{HOME}/.cargo/bin/cargo build -p bls-signatures-ffi --target-dir ${BLS_BUILD_PATH} --${BUILD_TYPE}
+    COMMAND cargo build -p bls-signatures-ffi --target-dir ${BLS_BUILD_PATH} --${BUILD_TYPE}
     WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/deps/bls-signatures"
     BYPRODUCTS ${BLS_LIBRARY}
   )

From ddb7c16892071239aa7aa86217030abe0b8daf96 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 15:54:07 -0800
Subject: [PATCH 05/13] [PR 128] Fix tinycbor include directory

When tinycbor is provided by an external build system (such as required when
git submodules are not supported), the tinycbor headers are placed in a
'tinycbor/' directory:

| #include <tinycbor/cbor.h>

We need to adjust the cbor sources for this directory, which means our
internal dependency needs to be built slightly differently. We copy the
headers to a folder in the build directory, and point the top-level CMake
to this folder.

Fixes build error:

| In file included from cbor_decode_stream.cpp:6:
| cbor_decode_stream.hpp:13:10: fatal error: cbor.h: No such file or directory
|  #include <cbor.h>
|           ^~~~~~~~
---
 CMakeLists.txt                         |  2 +-
 core/codec/cbor/cbor_decode_stream.hpp |  2 +-
 core/codec/cbor/cbor_encode_stream.hpp |  2 +-
 deps/tinycbor.cmake                    | 17 +++++++++++++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62ed5bc87c..2d4f7f74d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,7 @@ include_directories(
     SYSTEM
     # system includes
     deps/outcome
-    deps/tinycbor/src
+    ${TINY_CBOR_INCLUDE_DIRS}
 )
 
 add_subdirectory(core)
diff --git a/core/codec/cbor/cbor_decode_stream.hpp b/core/codec/cbor/cbor_decode_stream.hpp
index 235d187f94..ebc9e97b12 100644
--- a/core/codec/cbor/cbor_decode_stream.hpp
+++ b/core/codec/cbor/cbor_decode_stream.hpp
@@ -10,8 +10,8 @@
 
 #include <vector>
 
-#include <cbor.h>
 #include <gsl/span>
+#include <tinycbor/cbor.h>
 
 namespace fc::codec::cbor {
   /** Decodes CBOR */
diff --git a/core/codec/cbor/cbor_encode_stream.hpp b/core/codec/cbor/cbor_encode_stream.hpp
index 01187dee5e..ec1da34104 100644
--- a/core/codec/cbor/cbor_encode_stream.hpp
+++ b/core/codec/cbor/cbor_encode_stream.hpp
@@ -11,7 +11,7 @@
 #include <array>
 #include <vector>
 
-#include <cbor.h>
+#include <tinycbor/cbor.h>
 
 #include "common/enum.hpp"
 
diff --git a/deps/tinycbor.cmake b/deps/tinycbor.cmake
index 0d15553602..23d6b28eae 100644
--- a/deps/tinycbor.cmake
+++ b/deps/tinycbor.cmake
@@ -14,3 +14,20 @@ add_library(tinycbor
     tinycbor/src/cborvalidation.c
     )
 disable_clang_tidy(tinycbor)
+
+# Copy headers for core code to imitate install step
+set(TINY_CBOR_HEADERS
+    cbor.h
+    tinycbor-version.h
+    )
+foreach(header ${TINY_CBOR_HEADERS})
+    configure_file(tinycbor/src/${header}
+        include/tinycbor/${header}
+        COPYONLY
+        )
+endforeach()
+
+set(TINY_CBOR_INCLUDE_DIRS
+    ${CMAKE_BINARY_DIR}/deps/include
+    PARENT_SCOPE
+    )

From 17499a511aeddeedaa08a5f8ed9d965ca71d2f88 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 15:53:57 -0800
Subject: [PATCH 06/13] [PR 128] CMake: Expose CMake options to includes

This change shuffles the order of several CMake steps to expose CMake
options to included files.

By defining options before inclusion, included files are able to access
the input provided by the build system.
---
 CMakeLists.txt | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d4f7f74d6..a25b5a572b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,19 +35,9 @@ endif ()
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-include(CheckCXXCompilerFlag)
-include(cmake/toolchain-util.cmake)
-include(cmake/dependencies.cmake)
-include(cmake/functions.cmake)
-include(cmake/san.cmake)
-
 # export compile commands for clang-tidy to analyse only changed files
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-print("C flags: ${CMAKE_C_FLAGS}")
-print("CXX flags: ${CMAKE_CXX_FLAGS}")
-print("Using CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
-
 option(TESTING "Build tests" ON)
 option(CLANG_FORMAT "Enable clang-format target" ON)
 option(CLANG_TIDY "Enable clang-tidy checks during compilation" OFF)
@@ -59,6 +49,15 @@ option(MSAN "Enable memory sanitizer" OFF)
 option(TSAN "Enable thread sanitizer" OFF)
 option(UBSAN "Enable UB sanitizer" OFF)
 
+include(CheckCXXCompilerFlag)
+include(cmake/toolchain-util.cmake)
+include(cmake/dependencies.cmake)
+include(cmake/functions.cmake)
+include(cmake/san.cmake)
+
+print("C flags: ${CMAKE_C_FLAGS}")
+print("CXX flags: ${CMAKE_CXX_FLAGS}")
+print("Using CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
 
 ## setup compilation flags
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "^(AppleClang|Clang|GNU)$")

From 18d1e2cdfbbd2d58f4aa669912d3b90486ff23c3 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 15:53:57 -0800
Subject: [PATCH 07/13] [PR 128] CMake: Exclude test-related depends when
 building tests

When building without tests, GTest and GMock are not needed. This change
allows build systems to continue with filecoin compilation without devoting
resources to its testing infrastructure.
---
 cmake/dependencies.cmake | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 73a315b6a5..5a0690cead 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -1,10 +1,12 @@
 # hunter dependencies
 # https://docs.hunter.sh/en/latest/packages/
 
-# https://docs.hunter.sh/en/latest/packages/pkg/GTest.html
-hunter_add_package(GTest)
-find_package(GTest CONFIG REQUIRED)
-find_package(GMock CONFIG REQUIRED)
+if (TESTING)
+  # https://docs.hunter.sh/en/latest/packages/pkg/GTest.html
+  hunter_add_package(GTest)
+  find_package(GTest CONFIG REQUIRED)
+  find_package(GMock CONFIG REQUIRED)
+endif()
 
 # https://docs.hunter.sh/en/latest/packages/pkg/Boost.html
 hunter_add_package(Boost COMPONENTS date_time filesystem random system)

From 78668afef9c1bfb27f08edd17f29352657657970 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 15:53:58 -0800
Subject: [PATCH 08/13] [PR 128] CMake: Allow excluding git submodule depends

Not every build system can handle git submodules, so expose an option to
exclude these dependencies from the build
---
 CMakeLists.txt | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a25b5a572b..afb83be832 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 option(TESTING "Build tests" ON)
+option(BUILD_INTERNAL_DEPS "Build internal dependencies from git submodules" ON)
 option(CLANG_FORMAT "Enable clang-format target" ON)
 option(CLANG_TIDY "Enable clang-tidy checks during compilation" OFF)
 option(COVERAGE "Enable generation of coverage info" OFF)
@@ -101,19 +102,23 @@ if (CLANG_FORMAT)
   include(cmake/clang-format.cmake)
 endif ()
 
-add_subdirectory(deps)
+if (BUILD_INTERNAL_DEPS)
+  add_subdirectory(deps)
+endif()
 
 include_directories(
     # project includes
     ${PROJECT_SOURCE_DIR}/core
 )
 
-include_directories(
-    SYSTEM
-    # system includes
-    deps/outcome
-    ${TINY_CBOR_INCLUDE_DIRS}
-)
+if (BUILD_INTERNAL_DEPS)
+  include_directories(
+      SYSTEM
+      # system includes
+      deps/outcome
+      ${TINY_CBOR_INCLUDE_DIRS}
+  )
+endif()
 
 add_subdirectory(core)
 

From 9fd934efa3dae1881b47793c38e61c53422c0a19 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 15:52:58 -0800
Subject: [PATCH 09/13] [PR 128] CMake: Add Findcppcodec.cmake for building
 without Hunter

---
 cmake/dependencies.cmake         | 7 ++++++-
 cmake/modules/Findcppcodec.cmake | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 cmake/modules/Findcppcodec.cmake

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 5a0690cead..29af4fa812 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -1,6 +1,11 @@
 # hunter dependencies
 # https://docs.hunter.sh/en/latest/packages/
 
+# Append local modules path if Hunter is not enabled
+if (NOT HUNTER_ENABLED)
+  list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
+endif()
+
 if (TESTING)
   # https://docs.hunter.sh/en/latest/packages/pkg/GTest.html
   hunter_add_package(GTest)
@@ -45,4 +50,4 @@ find_package(libp2p CONFIG REQUIRED)
 
 # https://docs.hunter.sh/en/latest/packages/pkg/cppcodec.html
 hunter_add_package(cppcodec)
-find_package(cppcodec CONFIG REQUIRED)
+find_package(cppcodec REQUIRED)
diff --git a/cmake/modules/Findcppcodec.cmake b/cmake/modules/Findcppcodec.cmake
new file mode 100644
index 0000000000..d29cd92b56
--- /dev/null
+++ b/cmake/modules/Findcppcodec.cmake
@@ -0,0 +1,9 @@
+# Try to find cppcodec
+# Once done, this will define
+#
+# CPPCODEC_FOUND        -  system has cppcodec
+
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+  pkg_check_modules(CPPCODEC cppcodec)
+endif()

From f364edba049d4bd0bd6310730d4fc9229310385c Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 15:52:59 -0800
Subject: [PATCH 10/13] [PR 128] CMake: Add Findleveldb.cmake module for
 building without Hunter

Imported from:

https://gitlab.cern.ch/dss/eos/blob/master/cmake/Findleveldb.cmake
---
 cmake/dependencies.cmake        |  2 +-
 cmake/modules/Findleveldb.cmake | 47 +++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 cmake/modules/Findleveldb.cmake

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 29af4fa812..254bf2cdd6 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -42,7 +42,7 @@ find_package(Boost.DI CONFIG REQUIRED)
 
 # https://docs.hunter.sh/en/latest/packages/pkg/leveldb.html
 hunter_add_package(leveldb)
-find_package(leveldb CONFIG REQUIRED)
+find_package(leveldb REQUIRED)
 
 # https://github.com/soramitsu/libp2p
 hunter_add_package(libp2p)
diff --git a/cmake/modules/Findleveldb.cmake b/cmake/modules/Findleveldb.cmake
new file mode 100644
index 0000000000..1d8bca3d3b
--- /dev/null
+++ b/cmake/modules/Findleveldb.cmake
@@ -0,0 +1,47 @@
+#.rst:
+# Findleveldb
+# -----------
+# Finds the leveldb library
+#
+# This will define the following variables:
+#
+#   LEVELDB_FOUND        -  system has leveldb
+#   LEVELDB_INCLUDE_DIRS -  leveldb include directories
+#   LEVELDB_LIBRARIES    -  libraries needed to use leveldb
+#
+# and the following imported targets:
+#
+#   leveldb::leveldb   - The leveldb library
+#
+
+include(FindPackageHandleStandardArgs)
+
+find_path(
+  LEVELDB_INCLUDE_DIR
+  NAMES leveldb/db.h
+  HINTS ${LEVELDB_ROOT_DIR} $ENV{LEVELDB_ROOT_DIR}
+  PATH_SUFFIXES include)
+
+find_library(
+  LEVELDB_LIBRARY
+  NAMES leveldb
+  HINTS ${LEVELDB_ROOT_DIR} $ENV{LEVELDB_ROOT_DIR}
+  PATH_SUFFIXES ${LIBRARY_PATH_PREFIX})
+
+find_package_handle_standard_args(
+  leveldb
+  DEFAULT_MSG LEVELDB_LIBRARY LEVELDB_INCLUDE_DIR)
+
+if (LEVELDB_FOUND)
+  set(LEVELDB_INCLUDE_DIRS ${LEVELDB_INCLUDE_DIR})
+  set(LEVELDB_LIBRARIES ${LEVELDB_LIBRARY})
+
+  if (NOT TARGET leveldb::leveldb)
+    add_library(leveldb::leveldb UNKNOWN IMPORTED)
+    set_target_properties(leveldb::leveldb PROPERTIES
+      IMPORTED_LOCATION "${LEVELDB_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES "${LEVELDB_INCLUDE_DIR}")
+  endif()
+endif()
+
+mark_as_advanced(LEVELDB_LIBRARY LEVELDB_INCLUDE_DIR)

From 930b2180bda7bdaffa9f6eeb15929033abec11e7 Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 15:54:04 -0800
Subject: [PATCH 11/13] CMake: Prefix libraries to avoid name clashes

---
 core/adt/CMakeLists.txt                       | 28 ++++++-------
 core/blockchain/CMakeLists.txt                | 12 +++---
 core/blockchain/message_pool/CMakeLists.txt   |  8 ++--
 core/blockchain/production/CMakeLists.txt     | 20 +++++-----
 core/clock/CMakeLists.txt                     |  8 ++--
 core/codec/cbor/CMakeLists.txt                |  8 ++--
 core/codec/rle/CMakeLists.txt                 |  6 +--
 core/common/CMakeLists.txt                    | 26 ++++++------
 core/crypto/blake2/CMakeLists.txt             |  8 ++--
 core/crypto/bls/CMakeLists.txt                |  6 +--
 core/crypto/hasher/CMakeLists.txt             |  2 +-
 core/crypto/murmur/CMakeLists.txt             |  6 +--
 core/crypto/randomness/CMakeLists.txt         | 16 ++++----
 core/crypto/signature/CMakeLists.txt          |  6 +--
 core/crypto/vrf/CMakeLists.txt                | 10 ++---
 core/fslock/CMakeLists.txt                    |  6 +--
 core/power/CMakeLists.txt                     | 18 ++++-----
 core/primitives/address/CMakeLists.txt        | 12 +++---
 core/primitives/block/CMakeLists.txt          | 12 +++---
 core/primitives/chain/CMakeLists.txt          |  8 ++--
 core/primitives/chain_epoch/CMakeLists.txt    |  4 +-
 core/primitives/cid/CMakeLists.txt            | 16 ++++----
 .../persistent_block/CMakeLists.txt           | 11 +++++
 core/primitives/piece/CMakeLists.txt          |  8 ++--
 core/primitives/rle_bitset/CMakeLists.txt     |  8 ++--
 core/primitives/ticket/CMakeLists.txt         | 12 +++---
 core/primitives/tipset/CMakeLists.txt         | 18 ++++-----
 core/proofs/CMakeLists.txt                    | 28 ++++++-------
 core/storage/amt/CMakeLists.txt               | 12 +++---
 core/storage/chain/CMakeLists.txt             | 22 +++++-----
 core/storage/config/CMakeLists.txt            |  6 +--
 core/storage/filestore/CMakeLists.txt         |  6 +--
 core/storage/hamt/CMakeLists.txt              | 14 +++----
 core/storage/in_memory/CMakeLists.txt         |  6 +--
 core/storage/ipfs/CMakeLists.txt              | 28 ++++++-------
 core/storage/ipfs/merkledag/CMakeLists.txt    | 10 ++---
 core/storage/ipld/CMakeLists.txt              | 32 +++++++--------
 core/storage/keystore/CMakeLists.txt          | 14 +++----
 core/storage/leveldb/CMakeLists.txt           |  8 ++--
 core/storage/repository/CMakeLists.txt        | 28 ++++++-------
 core/vm/actor/CMakeLists.txt                  | 24 +++++------
 core/vm/actor/builtin/account/CMakeLists.txt  |  8 ++--
 core/vm/actor/builtin/cron/CMakeLists.txt     |  8 ++--
 core/vm/actor/builtin/init/CMakeLists.txt     | 10 ++---
 core/vm/actor/builtin/miner/CMakeLists.txt    | 12 +++---
 core/vm/actor/builtin/multisig/CMakeLists.txt |  8 ++--
 .../builtin/payment_channel/CMakeLists.txt    | 10 ++---
 core/vm/actor/builtin/reward/CMakeLists.txt   | 12 +++---
 core/vm/actor/builtin/shared/CMakeLists.txt   | 10 ++---
 .../builtin/storage_power/CMakeLists.txt      | 18 ++++-----
 core/vm/exit_code/CMakeLists.txt              |  6 +--
 core/vm/indices/CMakeLists.txt                |  4 +-
 core/vm/interpreter/CMakeLists.txt            |  6 +--
 core/vm/message/CMakeLists.txt                | 18 ++++-----
 core/vm/runtime/CMakeLists.txt                |  8 ++--
 core/vm/state/CMakeLists.txt                  |  8 ++--
 test/core/adt/CMakeLists.txt                  | 28 ++++++-------
 .../blockchain/message_pool/CMakeLists.txt    |  8 ++--
 .../core/blockchain/production/CMakeLists.txt |  6 +--
 test/core/clock/CMakeLists.txt                | 12 +++---
 test/core/codec/cbor/CMakeLists.txt           |  8 ++--
 test/core/codec/rleplus/CMakeLists.txt        |  6 +--
 test/core/common/CMakeLists.txt               | 20 +++++-----
 test/core/crypto/CMakeLists.txt               | 20 +++++-----
 test/core/crypto/randomness/CMakeLists.txt    |  6 +--
 test/core/crypto/vrf/CMakeLists.txt           | 14 +++----
 test/core/fslock/CMakeLists.txt               | 10 ++---
 test/core/power/CMakeLists.txt                | 16 ++++----
 test/core/primitives/CMakeLists.txt           |  4 +-
 test/core/primitives/address/CMakeLists.txt   | 20 +++++-----
 test/core/primitives/block/CMakeLists.txt     |  8 ++--
 .../primitives/chain_epoch/CMakeLists.txt     |  6 +--
 test/core/primitives/cid/CMakeLists.txt       |  6 +--
 .../persistent_block/CMakeLists.txt           |  9 +++++
 .../core/primitives/rle_bitset/CMakeLists.txt |  8 ++--
 test/core/primitives/ticket/CMakeLists.txt    | 40 +++++++++----------
 test/core/primitives/tipset/CMakeLists.txt    | 12 +++---
 test/core/proofs/CMakeLists.txt               | 13 +++---
 test/core/storage/amt/CMakeLists.txt          | 10 ++---
 .../chain/chain_data_store/CMakeLists.txt     |  8 ++--
 .../storage/chain/chain_store/CMakeLists.txt  | 16 ++++----
 .../chain/datastore_key/CMakeLists.txt        | 20 +++++-----
 test/core/storage/config/CMakeLists.txt       |  8 ++--
 test/core/storage/filestore/CMakeLists.txt    |  8 ++--
 test/core/storage/hamt/CMakeLists.txt         | 10 ++---
 test/core/storage/ipfs/CMakeLists.txt         | 20 +++++-----
 .../storage/ipfs/merkledag/CMakeLists.txt     |  8 ++--
 test/core/storage/keystore/CMakeLists.txt     | 10 ++---
 test/core/storage/leveldb/CMakeLists.txt      | 16 ++++----
 test/core/storage/repository/CMakeLists.txt   |  8 ++--
 test/core/vm/actor/CMakeLists.txt             | 16 ++++----
 .../vm/actor/builtin/account/CMakeLists.txt   | 10 ++---
 .../core/vm/actor/builtin/cron/CMakeLists.txt |  6 +--
 .../core/vm/actor/builtin/init/CMakeLists.txt | 10 ++---
 .../vm/actor/builtin/miner/CMakeLists.txt     |  6 +--
 .../builtin/multisig_actor/CMakeLists.txt     |  6 +--
 .../builtin/payment_channel/CMakeLists.txt    |  6 +--
 .../builtin/storage_power/CMakeLists.txt      |  8 ++--
 test/core/vm/exit_code/CMakeLists.txt         |  6 +--
 test/core/vm/message/CMakeLists.txt           |  6 +--
 test/core/vm/runtime/CMakeLists.txt           |  8 ++--
 test/core/vm/state/CMakeLists.txt             | 10 ++---
 .../testutil/primitives/ticket/CMakeLists.txt | 20 +++++-----
 test/testutil/storage/CMakeLists.txt          | 22 +++++-----
 test/testutil/vm/message/CMakeLists.txt       |  6 +--
 105 files changed, 639 insertions(+), 616 deletions(-)
 create mode 100644 core/primitives/persistent_block/CMakeLists.txt
 create mode 100644 test/core/primitives/persistent_block/CMakeLists.txt

diff --git a/core/adt/CMakeLists.txt b/core/adt/CMakeLists.txt
index cc9d17fc24..c16dcffd21 100644
--- a/core/adt/CMakeLists.txt
+++ b/core/adt/CMakeLists.txt
@@ -3,31 +3,31 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_custom_target(adt
+add_custom_target(filecoin_adt
     DEPENDS
-    array
-    multimap
+    filecoin_array
+    filecoin_multimap
     )
 
-add_library(array
+add_library(filecoin_array
     impl/array.cpp
     )
-target_link_libraries(array
-    amt
+target_link_libraries(filecoin_array
+    filecoin_amt
     )
 
-add_library(balance_table_hamt
+add_library(filecoin_balance_table_hamt
     impl/balance_table_hamt.cpp
     )
-target_link_libraries(balance_table_hamt
-    address
-    hamt
+target_link_libraries(filecoin_balance_table_hamt
+    filecoin_address
+    filecoin_hamt
     )
 
-add_library(multimap
+add_library(filecoin_multimap
     impl/multimap.cpp
     )
-target_link_libraries(multimap
-    array
-    hamt
+target_link_libraries(filecoin_multimap
+    filecoin_array
+    filecoin_hamt
     )
diff --git a/core/blockchain/CMakeLists.txt b/core/blockchain/CMakeLists.txt
index 67c34bffe8..d776493d2e 100644
--- a/core/blockchain/CMakeLists.txt
+++ b/core/blockchain/CMakeLists.txt
@@ -6,16 +6,16 @@
 add_subdirectory(message_pool)
 add_subdirectory(production)
 
-add_library(block_validator
+add_library(filecoin_block_validator
     impl/block_validator_impl.cpp
     )
-target_link_libraries(block_validator
-    block
+target_link_libraries(filecoin_block_validator
+    filecoin_block
     )
 
-add_library(weight_calculator
+add_library(filecoin_weight_calculator
     impl/weight_calculator_impl.cpp
     )
-target_link_libraries(weight_calculator
-    tipset
+target_link_libraries(filecoin_weight_calculator
+    filecoin_tipset
     )
diff --git a/core/blockchain/message_pool/CMakeLists.txt b/core/blockchain/message_pool/CMakeLists.txt
index 0d4cb24ece..39191d9b67 100644
--- a/core/blockchain/message_pool/CMakeLists.txt
+++ b/core/blockchain/message_pool/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(message_pool
+add_library(filecoin_message_pool
     impl/gas_price_scored_message_storage.cpp
     impl/message_pool_error.cpp)
-target_link_libraries(message_pool
-    outcome
-    message
+target_link_libraries(filecoin_message_pool
+    filecoin_outcome
+    filecoin_message
     )
diff --git a/core/blockchain/production/CMakeLists.txt b/core/blockchain/production/CMakeLists.txt
index 312f33ad83..72adc4c726 100644
--- a/core/blockchain/production/CMakeLists.txt
+++ b/core/blockchain/production/CMakeLists.txt
@@ -3,16 +3,16 @@
 #SPDX - License - Identifier : Apache - 2.0
 #
 
-add_library(block_producer
+add_library(filecoin_block_producer
     impl/block_producer_impl.cpp
     )
-target_link_libraries(block_producer
-    bls_provider
-    outcome
-    buffer
-    address
-    clock
-    interpreter
-    tipset
-    ipfs_datastore_in_memory
+target_link_libraries(filecoin_block_producer
+    filecoin_bls_provider
+    filecoin_outcome
+    filecoin_buffer
+    filecoin_address
+    filecoin_clock
+    filecoin_interpreter
+    filecoin_tipset
+    filecoin_ipfs_datastore_in_memory
     )
diff --git a/core/clock/CMakeLists.txt b/core/clock/CMakeLists.txt
index f646d28a45..5c35db40a3 100644
--- a/core/clock/CMakeLists.txt
+++ b/core/clock/CMakeLists.txt
@@ -3,17 +3,17 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(clock
+add_library(filecoin_clock
     chain_epoch_clock.cpp
     impl/chain_epoch_clock_impl.cpp
     impl/utc_clock_impl.cpp
     time.cpp
     )
-target_compile_definitions(clock PRIVATE
+target_compile_definitions(filecoin_clock PRIVATE
     BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
     )
-target_link_libraries(clock
+target_link_libraries(filecoin_clock
     Boost::date_time
-    outcome
+    filecoin_outcome
     p2p::p2p_uvarint
     )
diff --git a/core/codec/cbor/CMakeLists.txt b/core/codec/cbor/CMakeLists.txt
index c9739514b5..2431e1f39a 100644
--- a/core/codec/cbor/CMakeLists.txt
+++ b/core/codec/cbor/CMakeLists.txt
@@ -3,14 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(cbor
+add_library(filecoin_cbor
     cbor_decode_stream.cpp
     cbor_encode_stream.cpp
     cbor_errors.cpp
     cbor_resolve.cpp
     )
-target_link_libraries(cbor
-    cid
-    outcome
+target_link_libraries(filecoin_cbor
+    filecoin_cid
+    filecoin_outcome
     tinycbor
     )
diff --git a/core/codec/rle/CMakeLists.txt b/core/codec/rle/CMakeLists.txt
index 672558e657..e263455690 100644
--- a/core/codec/rle/CMakeLists.txt
+++ b/core/codec/rle/CMakeLists.txt
@@ -1,9 +1,9 @@
-add_library(rle_plus_codec
+add_library(filecoin_rle_plus_codec
     rle_plus_encoding_stream.cpp
     rle_plus_errors.cpp
     )
 
-target_link_libraries(rle_plus_codec
+target_link_libraries(filecoin_rle_plus_codec
     Boost::boost
-    outcome
+    filecoin_outcome
   )
diff --git a/core/common/CMakeLists.txt b/core/common/CMakeLists.txt
index 755cbb52b7..d51c21e64d 100644
--- a/core/common/CMakeLists.txt
+++ b/core/common/CMakeLists.txt
@@ -3,41 +3,41 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(hexutil
+add_library(filecoin_hexutil
     hexutil.hpp
     hexutil.cpp
     )
-target_link_libraries(hexutil
+target_link_libraries(filecoin_hexutil
     Boost::boost
-    outcome
+    filecoin_outcome
     )
 
-add_library(blob
+add_library(filecoin_blob
     blob.hpp
     blob.cpp
     )
-target_link_libraries(blob
-    hexutil
+target_link_libraries(filecoin_blob
+    filecoin_hexutil
     )
 
-add_library(outcome INTERFACE)
-target_link_libraries(outcome INTERFACE
+add_library(filecoin_outcome INTERFACE)
+target_link_libraries(filecoin_outcome INTERFACE
     Boost::boost
     p2p::p2p
     )
 
-add_library(buffer
+add_library(filecoin_buffer
     buffer.hpp
     buffer.cpp
     buffer_back_insert_iterator.cpp
     )
-target_link_libraries(buffer
-    hexutil
+target_link_libraries(filecoin_buffer
+    filecoin_hexutil
     )
 
-add_library(logger
+add_library(filecoin_logger
     logger.cpp
     )
-target_link_libraries(logger
+target_link_libraries(filecoin_logger
     spdlog::spdlog
     )
diff --git a/core/crypto/blake2/CMakeLists.txt b/core/crypto/blake2/CMakeLists.txt
index 58623698d1..a3dbb88138 100644
--- a/core/crypto/blake2/CMakeLists.txt
+++ b/core/crypto/blake2/CMakeLists.txt
@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(blake2
+add_library(filecoin_blake2
     blake2s.c
     blake2b.c
     blake2b160.cpp
     )
-target_link_libraries(blake2
-    blob
-    outcome
+target_link_libraries(filecoin_blake2
+    filecoin_blob
+    filecoin_outcome
     )
diff --git a/core/crypto/bls/CMakeLists.txt b/core/crypto/bls/CMakeLists.txt
index cc87212045..52a292bf9d 100644
--- a/core/crypto/bls/CMakeLists.txt
+++ b/core/crypto/bls/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(bls_provider
+add_library(filecoin_bls_provider
     impl/bls_provider_impl.cpp
     )
 
-target_link_libraries(bls_provider
+target_link_libraries(filecoin_bls_provider
     bls_signatures_ffi
-    outcome
+    filecoin_outcome
     )
diff --git a/core/crypto/hasher/CMakeLists.txt b/core/crypto/hasher/CMakeLists.txt
index 2a1c7b8403..0fe0a7efea 100644
--- a/core/crypto/hasher/CMakeLists.txt
+++ b/core/crypto/hasher/CMakeLists.txt
@@ -7,5 +7,5 @@ add_library(filecoin_hasher
     hasher.cpp
     )
 target_link_libraries(filecoin_hasher
-    blake2
+    filecoin_blake2
     )
diff --git a/core/crypto/murmur/CMakeLists.txt b/core/crypto/murmur/CMakeLists.txt
index 4f94457b0f..23c6099371 100644
--- a/core/crypto/murmur/CMakeLists.txt
+++ b/core/crypto/murmur/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(murmur
+add_library(filecoin_murmur
     murmur.cpp
     )
-target_link_libraries(murmur
-    buffer
+target_link_libraries(filecoin_murmur
+    filecoin_buffer
     )
diff --git a/core/crypto/randomness/CMakeLists.txt b/core/crypto/randomness/CMakeLists.txt
index b15cc2c549..7d28baa118 100644
--- a/core/crypto/randomness/CMakeLists.txt
+++ b/core/crypto/randomness/CMakeLists.txt
@@ -1,22 +1,22 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(randomness_provider
+add_library(filecoin_randomness_provider
     impl/randomness_provider_impl.cpp
     )
-target_link_libraries(randomness_provider
+target_link_libraries(filecoin_randomness_provider
     Boost::boost
-    blob
-    buffer
+    filecoin_blob
+    filecoin_buffer
     p2p::p2p_sha
     )
 
-add_library(chain_randomness_provider
+add_library(filecoin_chain_randomness_provider
     impl/chain_randomness_provider_impl.cpp
     )
-target_link_libraries(chain_randomness_provider
+target_link_libraries(filecoin_chain_randomness_provider
     Boost::boost
-    blob
-    buffer
+    filecoin_blob
+    filecoin_buffer
     p2p::p2p_sha
     )
diff --git a/core/crypto/signature/CMakeLists.txt b/core/crypto/signature/CMakeLists.txt
index efd04857a5..f9dcbdf3a4 100644
--- a/core/crypto/signature/CMakeLists.txt
+++ b/core/crypto/signature/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(signature
+add_library(filecoin_signature
     signature.cpp
     )
-target_link_libraries(signature
-    outcome
+target_link_libraries(filecoin_signature
+    filecoin_outcome
     )
diff --git a/core/crypto/vrf/CMakeLists.txt b/core/crypto/vrf/CMakeLists.txt
index 15779b42c9..d1de58770d 100644
--- a/core/crypto/vrf/CMakeLists.txt
+++ b/core/crypto/vrf/CMakeLists.txt
@@ -1,14 +1,14 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(vrf_provider
+add_library(filecoin_vrf_provider
     impl/vrf_provider_impl.cpp
     vrf_hash_encoder.cpp
     vrf_types.cpp
     )
-target_link_libraries(vrf_provider
-    address
-    blob
-    buffer
+target_link_libraries(filecoin_vrf_provider
+    filecoin_address
+    filecoin_blob
+    filecoin_buffer
     p2p::p2p_sha
     )
diff --git a/core/fslock/CMakeLists.txt b/core/fslock/CMakeLists.txt
index 21542ced0f..54012d0270 100644
--- a/core/fslock/CMakeLists.txt
+++ b/core/fslock/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(fslock
+add_library(filecoin_fslock
         fslock.cpp
         fslock_error.cpp
         )
 
-target_link_libraries(fslock
-        outcome
+target_link_libraries(filecoin_fslock
+        filecoin_outcome
         )
diff --git a/core/power/CMakeLists.txt b/core/power/CMakeLists.txt
index 26dde2a5d8..05a7e94b3b 100644
--- a/core/power/CMakeLists.txt
+++ b/core/power/CMakeLists.txt
@@ -1,21 +1,21 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(power_table
+add_library(filecoin_power_table
     impl/power_table_impl.cpp
     impl/power_table_error.cpp
     )
-target_link_libraries(power_table
-    address
-    outcome
+target_link_libraries(filecoin_power_table
+    filecoin_address
+    filecoin_outcome
     )
 
-add_library(power_table_hamt
+add_library(filecoin_power_table_hamt
     impl/power_table_hamt.cpp
     impl/power_table_error.cpp
     )
-target_link_libraries(power_table_hamt
-    address
-    outcome
-    hamt
+target_link_libraries(filecoin_power_table_hamt
+    filecoin_address
+    filecoin_outcome
+    filecoin_hamt
     )
diff --git a/core/primitives/address/CMakeLists.txt b/core/primitives/address/CMakeLists.txt
index df12d39e9b..a0e88f03f3 100644
--- a/core/primitives/address/CMakeLists.txt
+++ b/core/primitives/address/CMakeLists.txt
@@ -1,14 +1,14 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(address
+add_library(filecoin_address
     address.cpp
     address_codec.cpp
         ../piece/piece.hpp ../piece/piece.hpp)
-target_link_libraries(address
+target_link_libraries(filecoin_address
     Boost::boost
-    blake2
-    blob
-    cbor
-    outcome
+    filecoin_blake2
+    filecoin_blob
+    filecoin_cbor
+    filecoin_outcome
     )
diff --git a/core/primitives/block/CMakeLists.txt b/core/primitives/block/CMakeLists.txt
index 4589b009e8..77a91d246a 100644
--- a/core/primitives/block/CMakeLists.txt
+++ b/core/primitives/block/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(block INTERFACE)
-target_link_libraries(block INTERFACE
-    address
-    cbor
-    signature
-    tickets
+add_library(filecoin_block INTERFACE)
+target_link_libraries(filecoin_block INTERFACE
+    filecoin_address
+    filecoin_cbor
+    filecoin_signature
+    filecoin_tickets
     )
diff --git a/core/primitives/chain/CMakeLists.txt b/core/primitives/chain/CMakeLists.txt
index 46014930d1..0c72eda61b 100644
--- a/core/primitives/chain/CMakeLists.txt
+++ b/core/primitives/chain/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(chain
+add_library(filecoin_chain
     chain.cpp
     )
-target_link_libraries(chain
-    outcome
-    tickets
+target_link_libraries(filecoin_chain
+    filecoin_outcome
+    filecoin_tickets
     )
diff --git a/core/primitives/chain_epoch/CMakeLists.txt b/core/primitives/chain_epoch/CMakeLists.txt
index 79f8acc50f..a0c030cb4b 100644
--- a/core/primitives/chain_epoch/CMakeLists.txt
+++ b/core/primitives/chain_epoch/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(chain_epoch_codec
+add_library(filecoin_chain_epoch_codec
     chain_epoch_codec.cpp
     )
-target_link_libraries(chain_epoch_codec
+target_link_libraries(filecoin_chain_epoch_codec
     p2p::p2p_uvarint
     )
diff --git a/core/primitives/cid/CMakeLists.txt b/core/primitives/cid/CMakeLists.txt
index b7fa640c67..479efc15cd 100644
--- a/core/primitives/cid/CMakeLists.txt
+++ b/core/primitives/cid/CMakeLists.txt
@@ -3,24 +3,24 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(cid
+add_library(filecoin_cid
     cid.cpp
     json_codec.cpp
     )
 
-target_link_libraries(cid
+target_link_libraries(filecoin_cid
     Boost::boost
-    blake2
-    cbor
+    filecoin_blake2
+    filecoin_cbor
     p2p::p2p_cid
     )
 
-add_library(comm_cid
+add_library(filecoin_comm_cid
     comm_cid.cpp
     comm_cid_errors.cpp
     )
 
-target_link_libraries(comm_cid
-    cid
-    outcome
+target_link_libraries(filecoin_comm_cid
+    filecoin_cid
+    filecoin_outcome
     )
diff --git a/core/primitives/persistent_block/CMakeLists.txt b/core/primitives/persistent_block/CMakeLists.txt
new file mode 100644
index 0000000000..235b45b7c9
--- /dev/null
+++ b/core/primitives/persistent_block/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(filecoin_persistent_block
+    persistent_block.cpp
+    )
+target_link_libraries(filecoin_persistent_block
+    filecoin_buffer
+    filecoin_cbor
+    filecoin_cid
+    )
diff --git a/core/primitives/piece/CMakeLists.txt b/core/primitives/piece/CMakeLists.txt
index 04ee186fb9..491dc3769a 100644
--- a/core/primitives/piece/CMakeLists.txt
+++ b/core/primitives/piece/CMakeLists.txt
@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(piece
+add_library(filecoin_piece
         piece.cpp
         piece_error.cpp
         )
 
-target_link_libraries(piece
-        cid
-        outcome
+target_link_libraries(filecoin_piece
+        filecoin_cid
+        filecoin_outcome
         )
diff --git a/core/primitives/rle_bitset/CMakeLists.txt b/core/primitives/rle_bitset/CMakeLists.txt
index 67e48860d6..c980d1fcce 100644
--- a/core/primitives/rle_bitset/CMakeLists.txt
+++ b/core/primitives/rle_bitset/CMakeLists.txt
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(rle_bitset INTERFACE)
-target_link_libraries(rle_bitset INTERFACE
-    cbor
-    rle_plus_codec
+add_library(filecoin_rle_bitset INTERFACE)
+target_link_libraries(filecoin_rle_bitset INTERFACE
+    filecoin_cbor
+    filecoin_rle_plus_codec
     )
diff --git a/core/primitives/ticket/CMakeLists.txt b/core/primitives/ticket/CMakeLists.txt
index 7e9eaa278e..e7fdb845b7 100644
--- a/core/primitives/ticket/CMakeLists.txt
+++ b/core/primitives/ticket/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(tickets
+add_library(filecoin_tickets
     ticket.cpp
     epost_ticket.cpp
     ticket_codec.cpp
     epost_ticket_codec.cpp
     )
-target_link_libraries(tickets
-    blob
-    buffer
-    cbor
+target_link_libraries(filecoin_tickets
+    filecoin_blob
+    filecoin_buffer
+    filecoin_cbor
     p2p::p2p_sha
-    address
+    filecoin_address
     )
diff --git a/core/primitives/tipset/CMakeLists.txt b/core/primitives/tipset/CMakeLists.txt
index 1b226e3e18..aa5aa40ccb 100644
--- a/core/primitives/tipset/CMakeLists.txt
+++ b/core/primitives/tipset/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(tipset
+add_library(filecoin_tipset
     tipset.cpp
     tipset_key.cpp
     )
-target_link_libraries(tipset
-    address
-    block
-    buffer
-    cbor
-    cid
-    logger
-    tickets
+target_link_libraries(filecoin_tipset
+    filecoin_address
+    filecoin_block
+    filecoin_buffer
+    filecoin_cbor
+    filecoin_cid
+    filecoin_logger
+    filecoin_tickets
     )
diff --git a/core/proofs/CMakeLists.txt b/core/proofs/CMakeLists.txt
index 3b8fb09acd..9d65bccb99 100644
--- a/core/proofs/CMakeLists.txt
+++ b/core/proofs/CMakeLists.txt
@@ -3,39 +3,39 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(proof_param_provider
+add_library(filecoin_proof_param_provider
         proof_param_provider.cpp
         proof_param_provider_error.cpp
         )
 
-target_link_libraries(proof_param_provider
+target_link_libraries(filecoin_proof_param_provider
         Boost::system
-        outcome
-        blake2
-        logger
+        filecoin_outcome
+        filecoin_blake2
+        filecoin_logger
         )
 
 add_custom_command(
-        TARGET proof_param_provider PRE_BUILD
+        TARGET filecoin_proof_param_provider PRE_BUILD
         COMMAND ${CMAKE_COMMAND} -E make_directory
         /var/tmp/filecoin-proof-parameters)
 
 add_custom_command(
-        TARGET proof_param_provider PRE_LINK
+        TARGET filecoin_proof_param_provider PRE_LINK
         COMMAND ${CMAKE_COMMAND} -E copy
         ${CMAKE_CURRENT_SOURCE_DIR}/parameters.json
         /var/tmp/filecoin-proof-parameters/parameters.json)
 
-add_library(proofs
+add_library(filecoin_proofs
         proofs.cpp
         proofs_error.cpp
         )
 
-target_link_libraries(proofs
+target_link_libraries(filecoin_proofs
         filecoin_ffi
-        outcome
-        blob
-        logger
-        comm_cid
-        piece
+        filecoin_outcome
+        filecoin_blob
+        filecoin_logger
+        filecoin_comm_cid
+        filecoin_piece
         )
diff --git a/core/storage/amt/CMakeLists.txt b/core/storage/amt/CMakeLists.txt
index 731554e85a..3e201f36a4 100644
--- a/core/storage/amt/CMakeLists.txt
+++ b/core/storage/amt/CMakeLists.txt
@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(amt
+add_library(filecoin_amt
     amt.cpp
     )
-target_link_libraries(amt
-    cbor
-    cid
-    outcome
-    ipld_block
+target_link_libraries(filecoin_amt
+    filecoin_cbor
+    filecoin_cid
+    filecoin_outcome
+    filecoin_ipld_block
     )
diff --git a/core/storage/chain/CMakeLists.txt b/core/storage/chain/CMakeLists.txt
index 0620314607..b7d684a2d0 100644
--- a/core/storage/chain/CMakeLists.txt
+++ b/core/storage/chain/CMakeLists.txt
@@ -1,27 +1,27 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(chain_store
+add_library(filecoin_chain_store
     impl/chain_store_impl.cpp
     )
-target_link_libraries(chain_store
-    chain_randomness_provider
-    datastore_key
-    ipfs_blockservice
-    logger
+target_link_libraries(filecoin_chain_store
+    filecoin_chain_randomness_provider
+    filecoin_datastore_key
+    filecoin_ipfs_blockservice
+    filecoin_logger
     )
 
-add_library(datastore_key
+add_library(filecoin_datastore_key
     datastore_key.cpp
     )
-target_link_libraries(datastore_key
+target_link_libraries(filecoin_datastore_key
     Boost::boost
     Boost::filesystem
     )
 
-add_library(chain_data_store
+add_library(filecoin_chain_data_store
     impl/chain_data_store_impl.cpp
     )
-target_link_libraries(chain_data_store
-    datastore_key
+target_link_libraries(filecoin_chain_data_store
+    filecoin_datastore_key
     )
diff --git a/core/storage/config/CMakeLists.txt b/core/storage/config/CMakeLists.txt
index 524a7bf2bc..89b95903ab 100644
--- a/core/storage/config/CMakeLists.txt
+++ b/core/storage/config/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(config
+add_library(filecoin_config
     config.cpp
     config_error.cpp
     )
-target_link_libraries(config
-    outcome
+target_link_libraries(filecoin_config
+    filecoin_outcome
     )
diff --git a/core/storage/filestore/CMakeLists.txt b/core/storage/filestore/CMakeLists.txt
index 3bdc56ed2b..c109e569d7 100644
--- a/core/storage/filestore/CMakeLists.txt
+++ b/core/storage/filestore/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filestore
+add_library(filecoin_filestore
     filestore_error.cpp
     impl/filesystem/filesystem_file.cpp
     impl/filesystem/filesystem_filestore.cpp
     )
-target_link_libraries(filestore
+target_link_libraries(filecoin_filestore
     Boost::filesystem
-    outcome
+    filecoin_outcome
     )
diff --git a/core/storage/hamt/CMakeLists.txt b/core/storage/hamt/CMakeLists.txt
index 6f23d77a87..99c9db030d 100644
--- a/core/storage/hamt/CMakeLists.txt
+++ b/core/storage/hamt/CMakeLists.txt
@@ -3,13 +3,13 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(hamt
+add_library(filecoin_hamt
     hamt.cpp
     )
-target_link_libraries(hamt
-    blob
-    cbor
-    cid
-    murmur
-    outcome
+target_link_libraries(filecoin_hamt
+    filecoin_blob
+    filecoin_cbor
+    filecoin_cid
+    filecoin_murmur
+    filecoin_outcome
     )
diff --git a/core/storage/in_memory/CMakeLists.txt b/core/storage/in_memory/CMakeLists.txt
index 6514a98202..d71ac54b8c 100644
--- a/core/storage/in_memory/CMakeLists.txt
+++ b/core/storage/in_memory/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(in_memory_storage
+add_library(filecoin_in_memory_storage
     in_memory_storage.cpp
     )
-target_link_libraries(in_memory_storage
-    buffer
+target_link_libraries(filecoin_in_memory_storage
+    filecoin_buffer
     )
diff --git a/core/storage/ipfs/CMakeLists.txt b/core/storage/ipfs/CMakeLists.txt
index e03d31bcd5..2b73ca4860 100644
--- a/core/storage/ipfs/CMakeLists.txt
+++ b/core/storage/ipfs/CMakeLists.txt
@@ -2,32 +2,32 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
-add_library(ipfs_datastore_in_memory
+add_library(filecoin_ipfs_datastore_in_memory
     impl/in_memory_datastore.cpp
     impl/ipfs_datastore_error.cpp
     )
-target_link_libraries(ipfs_datastore_in_memory
-    buffer
-    cbor
-    cid
+target_link_libraries(filecoin_ipfs_datastore_in_memory
+    filecoin_buffer
+    filecoin_cbor
+    filecoin_cid
     )
 
-add_library(ipfs_datastore_leveldb
+add_library(filecoin_ipfs_datastore_leveldb
     impl/datastore_leveldb.cpp
     impl/ipfs_datastore_error.cpp
     )
-target_link_libraries(ipfs_datastore_leveldb
-    buffer
-    cbor
-    cid
-    leveldb
+target_link_libraries(filecoin_ipfs_datastore_leveldb
+    filecoin_buffer
+    filecoin_cbor
+    filecoin_cid
+    filecoin_leveldb
     )
 
-add_library(ipfs_blockservice
+add_library(filecoin_ipfs_blockservice
     impl/ipfs_block_service.cpp
     )
-target_link_libraries(ipfs_blockservice
-    buffer
+target_link_libraries(filecoin_ipfs_blockservice
+    filecoin_buffer
     )
 
 add_subdirectory(merkledag)
diff --git a/core/storage/ipfs/merkledag/CMakeLists.txt b/core/storage/ipfs/merkledag/CMakeLists.txt
index 0400b3127a..b6c1902030 100644
--- a/core/storage/ipfs/merkledag/CMakeLists.txt
+++ b/core/storage/ipfs/merkledag/CMakeLists.txt
@@ -3,13 +3,13 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(ipfs_merkledag_service
+add_library(filecoin_ipfs_merkledag_service
     impl/merkledag_service_impl.cpp
     impl/leaf_impl.cpp
     )
-target_link_libraries(ipfs_merkledag_service
+target_link_libraries(filecoin_ipfs_merkledag_service
     Boost::boost
-    ipld_node
-    ipfs_blockservice
-    ipfs_datastore_in_memory
+    filecoin_ipld_node
+    filecoin_ipfs_blockservice
+    filecoin_ipfs_datastore_in_memory
     )
diff --git a/core/storage/ipld/CMakeLists.txt b/core/storage/ipld/CMakeLists.txt
index b56340c59c..c6b0b54af8 100644
--- a/core/storage/ipld/CMakeLists.txt
+++ b/core/storage/ipld/CMakeLists.txt
@@ -12,38 +12,38 @@ execute_process(COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --cpp_out=${PB_BUILD_DIR}
     RESULT_VARIABLE CMD_OUTPUT
     )
 
-add_library(ipld_node_protobuf
+add_library(filecoin_ipld_node_protobuf
     ${PB_BUILD_DIR}/ipld_node.pb.h
     ${PB_BUILD_DIR}/ipld_node.pb.cc
     )
-target_include_directories(ipld_node_protobuf PUBLIC $<BUILD_INTERFACE:${PB_BUILD_DIR}>)
-target_link_libraries(ipld_node_protobuf
+target_include_directories(filecoin_ipld_node_protobuf PUBLIC $<BUILD_INTERFACE:${PB_BUILD_DIR}>)
+target_link_libraries(filecoin_ipld_node_protobuf
     protobuf::libprotobuf
     )
-disable_clang_tidy(ipld_node_protobuf)
+disable_clang_tidy(filecoin_ipld_node_protobuf)
 
-add_library(ipld_block INTERFACE)
-target_link_libraries(ipld_block INTERFACE
-    cid
+add_library(filecoin_ipld_block INTERFACE)
+target_link_libraries(filecoin_ipld_block INTERFACE
+    filecoin_cid
     filecoin_hasher
     )
 
-add_library(ipld_link
+add_library(filecoin_ipld_link
     impl/ipld_link_impl.cpp
     )
-target_link_libraries(ipld_link
-    cid
+target_link_libraries(filecoin_ipld_link
+    filecoin_cid
     )
 
-add_library(ipld_node
+add_library(filecoin_ipld_node
     impl/ipld_node_impl.cpp
     impl/ipld_node_encoder_pb.cpp
     impl/ipld_node_decoder_pb.cpp
     )
-target_link_libraries(ipld_node
-    ipld_node_protobuf
-    ipld_link
-    ipld_block
+target_link_libraries(filecoin_ipld_node
+    filecoin_ipld_node_protobuf
+    filecoin_ipld_link
+    filecoin_ipld_block
     Boost::boost
-    cid
+    filecoin_cid
     )
diff --git a/core/storage/keystore/CMakeLists.txt b/core/storage/keystore/CMakeLists.txt
index c7c16457ed..ce3cbe309e 100644
--- a/core/storage/keystore/CMakeLists.txt
+++ b/core/storage/keystore/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(keystore
+add_library(filecoin_keystore
     keystore.cpp
     keystore_error.cpp
     impl/filesystem/filesystem_keystore.cpp
     impl/in_memory/in_memory_keystore.cpp
     )
-target_link_libraries(keystore
-    address
-    bls_provider
-    filestore
-    outcome
-    signature
+target_link_libraries(filecoin_keystore
+    filecoin_address
+    filecoin_bls_provider
+    filecoin_filestore
+    filecoin_outcome
+    filecoin_signature
     )
diff --git a/core/storage/leveldb/CMakeLists.txt b/core/storage/leveldb/CMakeLists.txt
index 363d1b519d..bda3ed8e6e 100644
--- a/core/storage/leveldb/CMakeLists.txt
+++ b/core/storage/leveldb/CMakeLists.txt
@@ -1,14 +1,14 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(leveldb
+add_library(filecoin_leveldb
     leveldb.cpp
     leveldb_batch.cpp
     leveldb_error.cpp
     leveldb_cursor.cpp
     )
-target_link_libraries(leveldb
+target_link_libraries(filecoin_leveldb
     leveldb::leveldb
-    buffer
-    logger
+    filecoin_buffer
+    filecoin_logger
     )
diff --git a/core/storage/repository/CMakeLists.txt b/core/storage/repository/CMakeLists.txt
index 03ce314043..15d55f29c0 100644
--- a/core/storage/repository/CMakeLists.txt
+++ b/core/storage/repository/CMakeLists.txt
@@ -1,30 +1,30 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(repository
+add_library(filecoin_repository
     impl/repository.cpp
     impl/repository_error.cpp
     )
-target_link_libraries(repository
-    outcome
+target_link_libraries(filecoin_repository
+    filecoin_outcome
     )
 
-add_library(filesystem_repository
+add_library(filecoin_filesystem_repository
     impl/filesystem_repository.cpp
     )
-target_link_libraries(filesystem_repository
+target_link_libraries(filecoin_filesystem_repository
     Boost::filesystem
-    config
-    fslock
-    ipfs_datastore_leveldb
-    keystore
-    outcome
-    repository
+    filecoin_config
+    filecoin_fslock
+    filecoin_ipfs_datastore_leveldb
+    filecoin_keystore
+    filecoin_outcome
+    filecoin_repository
     )
 
-add_library(in_memory_repository
+add_library(filecoin_in_memory_repository
     impl/in_memory_repository.cpp
     )
-target_link_libraries(in_memory_repository
-    repository
+target_link_libraries(filecoin_in_memory_repository
+    filecoin_repository
     )
diff --git a/core/vm/actor/CMakeLists.txt b/core/vm/actor/CMakeLists.txt
index c71242e825..198568946b 100644
--- a/core/vm/actor/CMakeLists.txt
+++ b/core/vm/actor/CMakeLists.txt
@@ -5,19 +5,19 @@
 
 add_subdirectory(builtin)
 
-add_library(actor
+add_library(filecoin_actor
     actor.cpp
     impl/invoker_impl.cpp
     )
-target_link_libraries(actor
-    account_actor
-    address
-    buffer
-    cid
-    exit_code
-    init_actor
-    miner_actor
-    multisig_actor
-    storage_power_actor
-    cron_actor
+target_link_libraries(filecoin_actor
+    filecoin_account_actor
+    filecoin_address
+    filecoin_buffer
+    filecoin_cid
+    filecoin_exit_code
+    filecoin_init_actor
+    filecoin_miner_actor
+    filecoin_multisig_actor
+    filecoin_storage_power_actor
+    filecoin_cron_actor
     )
diff --git a/core/vm/actor/builtin/account/CMakeLists.txt b/core/vm/actor/builtin/account/CMakeLists.txt
index fc50bfb5e2..5de920908a 100644
--- a/core/vm/actor/builtin/account/CMakeLists.txt
+++ b/core/vm/actor/builtin/account/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(account_actor
+add_library(filecoin_account_actor
     account_actor.cpp
     )
-target_link_libraries(account_actor
-    actor
-    outcome
+target_link_libraries(filecoin_account_actor
+    filecoin_actor
+    filecoin_outcome
     )
diff --git a/core/vm/actor/builtin/cron/CMakeLists.txt b/core/vm/actor/builtin/cron/CMakeLists.txt
index 1d2652dd8a..536c3434f6 100644
--- a/core/vm/actor/builtin/cron/CMakeLists.txt
+++ b/core/vm/actor/builtin/cron/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(cron_actor
+add_library(filecoin_cron_actor
     cron_actor.cpp
     )
-target_link_libraries(cron_actor
-    actor
-    outcome
+target_link_libraries(filecoin_cron_actor
+    filecoin_actor
+    filecoin_outcome
     )
diff --git a/core/vm/actor/builtin/init/CMakeLists.txt b/core/vm/actor/builtin/init/CMakeLists.txt
index 3201f17779..f7ce219020 100644
--- a/core/vm/actor/builtin/init/CMakeLists.txt
+++ b/core/vm/actor/builtin/init/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(init_actor
+add_library(filecoin_init_actor
     init_actor.cpp
     )
-target_link_libraries(init_actor
-    actor
-    outcome
-    hamt
+target_link_libraries(filecoin_init_actor
+    filecoin_actor
+    filecoin_outcome
+    filecoin_hamt
     )
diff --git a/core/vm/actor/builtin/miner/CMakeLists.txt b/core/vm/actor/builtin/miner/CMakeLists.txt
index 07de5be6ca..e9460ff1aa 100644
--- a/core/vm/actor/builtin/miner/CMakeLists.txt
+++ b/core/vm/actor/builtin/miner/CMakeLists.txt
@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(miner_actor
+add_library(filecoin_miner_actor
     miner_actor.cpp
     )
-target_link_libraries(miner_actor
-    address
-    cbor
-    chain_epoch_codec
-    rle_bitset
+target_link_libraries(filecoin_miner_actor
+    filecoin_address
+    filecoin_cbor
+    filecoin_chain_epoch_codec
+    filecoin_rle_bitset
     )
diff --git a/core/vm/actor/builtin/multisig/CMakeLists.txt b/core/vm/actor/builtin/multisig/CMakeLists.txt
index 109bccf670..e97ad1c0ae 100644
--- a/core/vm/actor/builtin/multisig/CMakeLists.txt
+++ b/core/vm/actor/builtin/multisig/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(multisig_actor
+add_library(filecoin_multisig_actor
     multisig_actor.cpp
     )
-target_link_libraries(multisig_actor
-    actor
-    outcome
+target_link_libraries(filecoin_multisig_actor
+    filecoin_actor
+    filecoin_outcome
     )
diff --git a/core/vm/actor/builtin/payment_channel/CMakeLists.txt b/core/vm/actor/builtin/payment_channel/CMakeLists.txt
index 59b3a5a771..90f83e02bd 100644
--- a/core/vm/actor/builtin/payment_channel/CMakeLists.txt
+++ b/core/vm/actor/builtin/payment_channel/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(payment_channel_actor
+add_library(filecoin_payment_channel_actor
     payment_channel_actor.cpp
     )
-target_link_libraries(payment_channel_actor
-    actor
-    outcome
-    signature
+target_link_libraries(filecoin_payment_channel_actor
+    filecoin_actor
+    filecoin_outcome
+    filecoin_signature
     )
diff --git a/core/vm/actor/builtin/reward/CMakeLists.txt b/core/vm/actor/builtin/reward/CMakeLists.txt
index e3fefef3f6..87a97fbe01 100644
--- a/core/vm/actor/builtin/reward/CMakeLists.txt
+++ b/core/vm/actor/builtin/reward/CMakeLists.txt
@@ -3,13 +3,13 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(reward_actor
+add_library(filecoin_reward_actor
     reward_actor.cpp
     )
-target_link_libraries(reward_actor
+target_link_libraries(filecoin_reward_actor
     Boost::boost
-    actor
-    address
-    exit_code
-    outcome
+    filecoin_actor
+    filecoin_address
+    filecoin_exit_code
+    filecoin_outcome
     )
diff --git a/core/vm/actor/builtin/shared/CMakeLists.txt b/core/vm/actor/builtin/shared/CMakeLists.txt
index e9d726b859..5bf1dfced1 100644
--- a/core/vm/actor/builtin/shared/CMakeLists.txt
+++ b/core/vm/actor/builtin/shared/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(builtin_shared
+add_library(filecoin_builtin_shared
     shared.cpp
     )
-target_link_libraries(builtin_shared
-    actor
-    address
-    runtime
+target_link_libraries(filecoin_builtin_shared
+    filecoin_actor
+    filecoin_address
+    filecoin_runtime
     )
diff --git a/core/vm/actor/builtin/storage_power/CMakeLists.txt b/core/vm/actor/builtin/storage_power/CMakeLists.txt
index d76c6d0f56..e393cae0e1 100644
--- a/core/vm/actor/builtin/storage_power/CMakeLists.txt
+++ b/core/vm/actor/builtin/storage_power/CMakeLists.txt
@@ -3,17 +3,17 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(storage_power_actor
+add_library(filecoin_storage_power_actor
     storage_power_actor_state.cpp
     storage_power_actor_export.cpp
     policy.cpp
     )
-target_link_libraries(storage_power_actor
-    actor
-    block
-    builtin_shared
-    chain_epoch_codec
-    balance_table_hamt
-    hamt
-    multimap
+target_link_libraries(filecoin_storage_power_actor
+    filecoin_actor
+    filecoin_block
+    filecoin_builtin_shared
+    filecoin_chain_epoch_codec
+    filecoin_balance_table_hamt
+    filecoin_hamt
+    filecoin_multimap
     )
diff --git a/core/vm/exit_code/CMakeLists.txt b/core/vm/exit_code/CMakeLists.txt
index e5fce38e2d..9804af86b7 100644
--- a/core/vm/exit_code/CMakeLists.txt
+++ b/core/vm/exit_code/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(exit_code
+add_library(filecoin_exit_code
     impl/exit_code.cpp
     )
-target_link_libraries(exit_code
-    outcome
+target_link_libraries(filecoin_exit_code
+    filecoin_outcome
     )
diff --git a/core/vm/indices/CMakeLists.txt b/core/vm/indices/CMakeLists.txt
index d12dc3a93a..40cb1feb7b 100644
--- a/core/vm/indices/CMakeLists.txt
+++ b/core/vm/indices/CMakeLists.txt
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(indices
+add_library(filecoin_indices
     impl/indices_impl.cpp
     )
-target_link_libraries(indices
+target_link_libraries(filecoin_indices
     )
diff --git a/core/vm/interpreter/CMakeLists.txt b/core/vm/interpreter/CMakeLists.txt
index e309a2b7eb..0253418f72 100644
--- a/core/vm/interpreter/CMakeLists.txt
+++ b/core/vm/interpreter/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(interpreter
+add_library(filecoin_interpreter
     impl/interpreter_impl.cpp
     )
-target_link_libraries(interpreter
-    amt
+target_link_libraries(filecoin_interpreter
+    filecoin_amt
     )
diff --git a/core/vm/message/CMakeLists.txt b/core/vm/message/CMakeLists.txt
index 5b9151e7a8..c5100a299b 100644
--- a/core/vm/message/CMakeLists.txt
+++ b/core/vm/message/CMakeLists.txt
@@ -3,19 +3,19 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(message
+add_library(filecoin_message
     message.cpp
     message_util.cpp
     impl/message_signer_impl.cpp
     )
 
-target_link_libraries(message
+target_link_libraries(filecoin_message
     Boost::boost
-    address
-    buffer
-    logger
-    keystore
-    outcome
-    signature
-    ipld_block
+    filecoin_address
+    filecoin_buffer
+    filecoin_logger
+    filecoin_keystore
+    filecoin_outcome
+    filecoin_signature
+    filecoin_ipld_block
     )
diff --git a/core/vm/runtime/CMakeLists.txt b/core/vm/runtime/CMakeLists.txt
index a6099d2f12..ff8f72e16a 100644
--- a/core/vm/runtime/CMakeLists.txt
+++ b/core/vm/runtime/CMakeLists.txt
@@ -3,13 +3,13 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(runtime
+add_library(filecoin_runtime
     impl/env.cpp
     impl/runtime_impl.cpp
     impl/actor_state_handle_impl.cpp
     impl/runtime_error.cpp)
-target_link_libraries(runtime
-    actor
+target_link_libraries(filecoin_runtime
+    filecoin_actor
     p2p::p2p_cid
-    randomness_provider
+    filecoin_randomness_provider
     )
diff --git a/core/vm/state/CMakeLists.txt b/core/vm/state/CMakeLists.txt
index fb65e4c89d..c3f0a2b193 100644
--- a/core/vm/state/CMakeLists.txt
+++ b/core/vm/state/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(state_tree
+add_library(filecoin_state_tree
     impl/state_tree_impl.cpp
     )
-target_link_libraries(state_tree
-    actor
+target_link_libraries(filecoin_state_tree
+    filecoin_actor
     Boost::boost
-    hamt
+    filecoin_hamt
     )
diff --git a/test/core/adt/CMakeLists.txt b/test/core/adt/CMakeLists.txt
index b5deed5000..e2a5f4e471 100644
--- a/test/core/adt/CMakeLists.txt
+++ b/test/core/adt/CMakeLists.txt
@@ -3,28 +3,28 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(array_test
+addtest(filecoin_array_test
     array_test.cpp
     )
-target_link_libraries(array_test
-    amt
-    array
-    ipfs_datastore_in_memory
+target_link_libraries(filecoin_array_test
+    filecoin_amt
+    filecoin_array
+    filecoin_ipfs_datastore_in_memory
     )
 
-addtest(balance_table_hamt_test
+addtest(filecoin_balance_table_hamt_test
     balance_table_hamt_test.cpp
     )
-target_link_libraries(balance_table_hamt_test
-    balance_table_hamt
-    ipfs_datastore_in_memory
+target_link_libraries(filecoin_balance_table_hamt_test
+    filecoin_balance_table_hamt
+    filecoin_ipfs_datastore_in_memory
     )
 
-addtest(multimap_test
+addtest(filecoin_multimap_test
     multimap_test.cpp
     )
-target_link_libraries(multimap_test
-    hamt
-    multimap
-    ipfs_datastore_in_memory
+target_link_libraries(filecoin_multimap_test
+    filecoin_hamt
+    filecoin_multimap
+    filecoin_ipfs_datastore_in_memory
     )
diff --git a/test/core/blockchain/message_pool/CMakeLists.txt b/test/core/blockchain/message_pool/CMakeLists.txt
index f94363ae6d..a2db953a5b 100644
--- a/test/core/blockchain/message_pool/CMakeLists.txt
+++ b/test/core/blockchain/message_pool/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(message_pool_test
+addtest(filecoin_message_pool_test
     gas_price_scored_message_storage_test.cpp
     )
-target_link_libraries(message_pool_test
-    message_pool
-    message_test_util
+target_link_libraries(filecoin_message_pool_test
+    filecoin_message_pool
+    filecoin_message_test_util
     )
diff --git a/test/core/blockchain/production/CMakeLists.txt b/test/core/blockchain/production/CMakeLists.txt
index 7e4c4ed8a6..df85429874 100644
--- a/test/core/blockchain/production/CMakeLists.txt
+++ b/test/core/blockchain/production/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(block_producer_test
+addtest(filecoin_block_producer_test
     block_producer_test.cpp
     )
-target_link_libraries(block_producer_test
-    block_producer
+target_link_libraries(filecoin_block_producer_test
+    filecoin_block_producer
     )
diff --git a/test/core/clock/CMakeLists.txt b/test/core/clock/CMakeLists.txt
index 8e6164ec21..061a1a2f08 100644
--- a/test/core/clock/CMakeLists.txt
+++ b/test/core/clock/CMakeLists.txt
@@ -3,16 +3,16 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(time_test
+addtest(filecoin_time_test
     time_test.cpp
     )
-target_link_libraries(time_test
-    clock
+target_link_libraries(filecoin_time_test
+    filecoin_clock
     )
 
-addtest(chain_epoch_clock_test
+addtest(filecoin_chain_epoch_clock_test
     chain_epoch_clock_test.cpp
     )
-target_link_libraries(chain_epoch_clock_test
-    clock
+target_link_libraries(filecoin_chain_epoch_clock_test
+    filecoin_clock
     )
diff --git a/test/core/codec/cbor/CMakeLists.txt b/test/core/codec/cbor/CMakeLists.txt
index db55afdafb..69b50f3ff1 100644
--- a/test/core/codec/cbor/CMakeLists.txt
+++ b/test/core/codec/cbor/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(cbor_test
+addtest(filecoin_cbor_test
     cbor_test.cpp
     )
-target_link_libraries(cbor_test
-    cbor
-    hexutil
+target_link_libraries(filecoin_cbor_test
+    filecoin_cbor
+    filecoin_hexutil
     )
diff --git a/test/core/codec/rleplus/CMakeLists.txt b/test/core/codec/rleplus/CMakeLists.txt
index 898d889248..671f709cdd 100644
--- a/test/core/codec/rleplus/CMakeLists.txt
+++ b/test/core/codec/rleplus/CMakeLists.txt
@@ -1,7 +1,7 @@
-addtest(rle_plus_codec_test
+addtest(filecoin_rle_plus_codec_test
     rle_plus_codec_test.cpp
     )
 
-target_link_libraries(rle_plus_codec_test
-    rle_plus_codec
+target_link_libraries(filecoin_rle_plus_codec_test
+    filecoin_rle_plus_codec
     )
diff --git a/test/core/common/CMakeLists.txt b/test/core/common/CMakeLists.txt
index 794cee0f87..f59ba3a3a7 100644
--- a/test/core/common/CMakeLists.txt
+++ b/test/core/common/CMakeLists.txt
@@ -3,25 +3,25 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(hexutil_test
+addtest(filecoin_hexutil_test
     hexutil_test.cpp
     )
-target_link_libraries(hexutil_test
-    hexutil
+target_link_libraries(filecoin_hexutil_test
+    filecoin_hexutil
     )
 
-addtest(blob_test
+addtest(filecoin_blob_test
     blob_test.cpp
     )
-target_link_libraries(blob_test
-    blob
+target_link_libraries(filecoin_blob_test
+    filecoin_blob
     )
 
-addtest(le_encoder_test
+addtest(filecoin_le_encoder_test
     le_encoder_test.cpp
     )
-target_link_libraries(le_encoder_test
+target_link_libraries(filecoin_le_encoder_test
     Boost::boost
-    blob
-    buffer
+    filecoin_blob
+    filecoin_buffer
     )
diff --git a/test/core/crypto/CMakeLists.txt b/test/core/crypto/CMakeLists.txt
index c59d655f0f..f175ca9645 100644
--- a/test/core/crypto/CMakeLists.txt
+++ b/test/core/crypto/CMakeLists.txt
@@ -3,26 +3,26 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(blake2_test
+addtest(filecoin_blake2_test
     blake2_test.cpp
     )
-target_link_libraries(blake2_test
-    blake2
-    hexutil
+target_link_libraries(filecoin_blake2_test
+    filecoin_blake2
+    filecoin_hexutil
     )
 
-addtest(bls_provider_test
+addtest(filecoin_bls_provider_test
     bls_provider_test.cpp
     )
-target_link_libraries(bls_provider_test
-    bls_provider
+target_link_libraries(filecoin_bls_provider_test
+    filecoin_bls_provider
     )
 
-addtest(murmur_test
+addtest(filecoin_murmur_test
     murmur_test.cpp
     )
-target_link_libraries(murmur_test
-    murmur
+target_link_libraries(filecoin_murmur_test
+    filecoin_murmur
     )
 
 add_subdirectory(randomness)
diff --git a/test/core/crypto/randomness/CMakeLists.txt b/test/core/crypto/randomness/CMakeLists.txt
index 24ca43a29a..63dffebbc8 100644
--- a/test/core/crypto/randomness/CMakeLists.txt
+++ b/test/core/crypto/randomness/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(randomness_provider_test
+addtest(filecoin_randomness_provider_test
     randomness_provider_test.cpp
     )
-target_link_libraries(randomness_provider_test
-    randomness_provider
+target_link_libraries(filecoin_randomness_provider_test
+    filecoin_randomness_provider
     )
diff --git a/test/core/crypto/vrf/CMakeLists.txt b/test/core/crypto/vrf/CMakeLists.txt
index b989a05793..d9e2902bb4 100644
--- a/test/core/crypto/vrf/CMakeLists.txt
+++ b/test/core/crypto/vrf/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(vrf_encoder_test
+addtest(filecoin_vrf_encoder_test
     vrf_encoder_test.cpp
     )
-target_link_libraries(vrf_encoder_test
-    vrf_provider
+target_link_libraries(filecoin_vrf_encoder_test
+    filecoin_vrf_provider
     )
 
-addtest(vrf_provider_test
+addtest(filecoin_vrf_provider_test
     vrf_provider_test.cpp
     )
-target_link_libraries(vrf_provider_test
-    vrf_provider
-    bls_provider
+target_link_libraries(filecoin_vrf_provider_test
+    filecoin_vrf_provider
+    filecoin_bls_provider
     )
diff --git a/test/core/fslock/CMakeLists.txt b/test/core/fslock/CMakeLists.txt
index 0d71e3e43f..4da6cc842f 100644
--- a/test/core/fslock/CMakeLists.txt
+++ b/test/core/fslock/CMakeLists.txt
@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(fslock_test
+addtest(filecoin_fslock_test
         fslock_test.cpp
         )
 
-target_link_libraries(fslock_test
-        fslock
-        base_fs_test
-        filestore
+target_link_libraries(filecoin_fslock_test
+        filecoin_fslock
+        filecoin_base_fs_test
+        filecoin_filestore
         )
diff --git a/test/core/power/CMakeLists.txt b/test/core/power/CMakeLists.txt
index 6403ee87b7..b51fd66408 100644
--- a/test/core/power/CMakeLists.txt
+++ b/test/core/power/CMakeLists.txt
@@ -1,18 +1,18 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(power_table_test
+addtest(filecoin_power_table_test
     power_table_test.cpp
     )
-target_link_libraries(power_table_test
-    power_table
-    base_fs_test
+target_link_libraries(filecoin_power_table_test
+    filecoin_power_table
+    filecoin_base_fs_test
     )
 
-addtest(power_table_hamt_test
+addtest(filecoin_power_table_hamt_test
     power_table_hamt_test.cpp
     )
-target_link_libraries(power_table_hamt_test
-    power_table_hamt
-    ipfs_datastore_in_memory
+target_link_libraries(filecoin_power_table_hamt_test
+    filecoin_power_table_hamt
+    filecoin_ipfs_datastore_in_memory
     )
diff --git a/test/core/primitives/CMakeLists.txt b/test/core/primitives/CMakeLists.txt
index 38a64aeb88..944f2ccd25 100644
--- a/test/core/primitives/CMakeLists.txt
+++ b/test/core/primitives/CMakeLists.txt
@@ -11,9 +11,9 @@ add_subdirectory(rle_bitset)
 add_subdirectory(ticket)
 add_subdirectory(tipset)
 
-addtest(big_int_test
+addtest(filecoin_big_int_test
     big_int_test.cpp
     )
-target_link_libraries(big_int_test
+target_link_libraries(filecoin_big_int_test
     Boost::boost
     )
diff --git a/test/core/primitives/address/CMakeLists.txt b/test/core/primitives/address/CMakeLists.txt
index b67ed455b5..3dda2007f1 100644
--- a/test/core/primitives/address/CMakeLists.txt
+++ b/test/core/primitives/address/CMakeLists.txt
@@ -1,24 +1,24 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(address_test
+addtest(filecoin_address_test
     address_test.cpp
     )
-target_link_libraries(address_test
-    address
+target_link_libraries(filecoin_address_test
+    filecoin_address
     )
 
-addtest(address_codec_test
+addtest(filecoin_address_codec_test
     address_codec_test.cpp
     )
-target_link_libraries(address_codec_test
-    address
+target_link_libraries(filecoin_address_codec_test
+    filecoin_address
     )
 
-addtest(address_verifier_test
+addtest(filecoin_address_verifier_test
     address_verifier_test.cpp
     )
-target_link_libraries(address_verifier_test
-    address
-    bls_provider
+target_link_libraries(filecoin_address_verifier_test
+    filecoin_address
+    filecoin_bls_provider
     )
diff --git a/test/core/primitives/block/CMakeLists.txt b/test/core/primitives/block/CMakeLists.txt
index 51a819eadb..44d4c86498 100644
--- a/test/core/primitives/block/CMakeLists.txt
+++ b/test/core/primitives/block/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(block_test
+addtest(filecoin_block_test
     block_test.cpp
     )
-target_link_libraries(block_test
-    block
-    hexutil
+target_link_libraries(filecoin_block_test
+    filecoin_block
+    filecoin_hexutil
     )
diff --git a/test/core/primitives/chain_epoch/CMakeLists.txt b/test/core/primitives/chain_epoch/CMakeLists.txt
index 8fe3f4197a..d78f0db3e3 100644
--- a/test/core/primitives/chain_epoch/CMakeLists.txt
+++ b/test/core/primitives/chain_epoch/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(chain_epoch_codec_test
+addtest(filecoin_chain_epoch_codec_test
     chain_epoch_codec_test.cpp
     )
-target_link_libraries(chain_epoch_codec_test
-    chain_epoch_codec
+target_link_libraries(filecoin_chain_epoch_codec_test
+    filecoin_chain_epoch_codec
     )
diff --git a/test/core/primitives/cid/CMakeLists.txt b/test/core/primitives/cid/CMakeLists.txt
index 6b7d9ba5c5..4b335109b5 100644
--- a/test/core/primitives/cid/CMakeLists.txt
+++ b/test/core/primitives/cid/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(cid_json_test
+addtest(filecoin_cid_json_test
     cid_json_test.cpp
     )
-target_link_libraries(cid_json_test
-    cid
+target_link_libraries(filecoin_cid_json_test
+    filecoin_cid
     )
diff --git a/test/core/primitives/persistent_block/CMakeLists.txt b/test/core/primitives/persistent_block/CMakeLists.txt
new file mode 100644
index 0000000000..4db7b896ef
--- /dev/null
+++ b/test/core/primitives/persistent_block/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+addtest(filecoin_persistent_block_test
+    persistent_block_test.cpp
+    )
+target_link_libraries(filecoin_persistent_block_test
+    filecoin_persistent_block
+    )
diff --git a/test/core/primitives/rle_bitset/CMakeLists.txt b/test/core/primitives/rle_bitset/CMakeLists.txt
index 260789881f..b387b624eb 100644
--- a/test/core/primitives/rle_bitset/CMakeLists.txt
+++ b/test/core/primitives/rle_bitset/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(rle_bitset_test
+addtest(filecoin_rle_bitset_test
     rle_bitset_test.cpp
     )
-target_link_libraries(rle_bitset_test
-    rle_bitset
-    hexutil
+target_link_libraries(filecoin_rle_bitset_test
+    filecoin_rle_bitset
+    filecoin_hexutil
     )
diff --git a/test/core/primitives/ticket/CMakeLists.txt b/test/core/primitives/ticket/CMakeLists.txt
index 5b29413761..eb56571f3a 100644
--- a/test/core/primitives/ticket/CMakeLists.txt
+++ b/test/core/primitives/ticket/CMakeLists.txt
@@ -2,46 +2,46 @@
 # SPDX-License-Identifier: Apache-2.0
 
 #test ticket
-addtest(ticket_test
+addtest(filecoin_ticket_test
     ticket_test.cpp
     )
-target_link_libraries(ticket_test
-    ticket_generator
-    ticket_printer
+target_link_libraries(filecoin_ticket_test
+    filecoin_ticket_generator
+    filecoin_ticket_printer
     )
 
 # test epost ticket and proof
-addtest(epost_ticket_test
+addtest(filecoin_epost_ticket_test
     epost_ticket_test.cpp
     )
-target_link_libraries(epost_ticket_test
-    ticket_generator
-    ticket_printer
+target_link_libraries(filecoin_epost_ticket_test
+    filecoin_ticket_generator
+    filecoin_ticket_printer
     )
 
 #test ticket encode/decode
-addtest(ticket_codec_test
+addtest(filecoin_ticket_codec_test
     ticket_codec_test.cpp
     )
-target_link_libraries(ticket_codec_test
-    ticket_generator
-    ticket_printer
+target_link_libraries(filecoin_ticket_codec_test
+    filecoin_ticket_generator
+    filecoin_ticket_printer
     )
 
 #test epost ticket and encode/decode
-addtest(epost_ticket_codec_test
+addtest(filecoin_epost_ticket_codec_test
     epost_ticket_codec_test.cpp
     )
-target_link_libraries(epost_ticket_codec_test
-    ticket_generator
-    ticket_printer
+target_link_libraries(filecoin_epost_ticket_codec_test
+    filecoin_ticket_generator
+    filecoin_ticket_printer
     )
 
 #test epost proof encode/decode
-addtest(epost_proof_codec_test
+addtest(filecoin_epost_proof_codec_test
     epost_proof_codec_test.cpp
     )
-target_link_libraries(epost_proof_codec_test
-    ticket_generator
-    ticket_printer
+target_link_libraries(filecoin_epost_proof_codec_test
+    filecoin_ticket_generator
+    filecoin_ticket_printer
     )
diff --git a/test/core/primitives/tipset/CMakeLists.txt b/test/core/primitives/tipset/CMakeLists.txt
index 8f8d41cd97..2fcc28fa71 100644
--- a/test/core/primitives/tipset/CMakeLists.txt
+++ b/test/core/primitives/tipset/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(tipset_test
+addtest(filecoin_tipset_test
     tipset_test.cpp
     )
-target_link_libraries(tipset_test
-    tipset
+target_link_libraries(filecoin_tipset_test
+    filecoin_tipset
     )
 
-addtest(tipset_key_test
+addtest(filecoin_tipset_key_test
     tipset_key_test.cpp
     )
-target_link_libraries(tipset_key_test
-    tipset
+target_link_libraries(filecoin_tipset_key_test
+    filecoin_tipset
     )
diff --git a/test/core/proofs/CMakeLists.txt b/test/core/proofs/CMakeLists.txt
index 5e0942a654..8e6591c81b 100644
--- a/test/core/proofs/CMakeLists.txt
+++ b/test/core/proofs/CMakeLists.txt
@@ -3,9 +3,12 @@
 #SPDX - License - Identifier : Apache - 2.0
 #
 
-addtest(proofs_test proofs_test.cpp)
+addtest(filecoin_proofs_test
+    proofs_test.cpp
+    )
 
-target_link_libraries( proofs_test
-        proofs
-        proof_param_provider
-        base_fs_test)
+target_link_libraries(filecoin_proofs_test
+    filecoin_proofs
+    filecoin_proof_param_provider
+    filecoin_base_fs_test
+    )
diff --git a/test/core/storage/amt/CMakeLists.txt b/test/core/storage/amt/CMakeLists.txt
index d1806f7f1f..d2e60b0f64 100644
--- a/test/core/storage/amt/CMakeLists.txt
+++ b/test/core/storage/amt/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(amt_test
+addtest(filecoin_amt_test
     amt_test.cpp
     )
-target_link_libraries(amt_test
-    amt
-    hexutil
-    ipfs_datastore_in_memory
+target_link_libraries(filecoin_amt_test
+    filecoin_amt
+    filecoin_hexutil
+    filecoin_ipfs_datastore_in_memory
     )
diff --git a/test/core/storage/chain/chain_data_store/CMakeLists.txt b/test/core/storage/chain/chain_data_store/CMakeLists.txt
index 1f8e7d31e5..4449c71292 100644
--- a/test/core/storage/chain/chain_data_store/CMakeLists.txt
+++ b/test/core/storage/chain/chain_data_store/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(chain_data_store_test
+addtest(filecoin_chain_data_store_test
     chain_data_store_test.cpp
     )
-target_link_libraries(chain_data_store_test
-    chain_data_store
-    ipfs_datastore_in_memory
+target_link_libraries(filecoin_chain_data_store_test
+    filecoin_chain_data_store
+    filecoin_ipfs_datastore_in_memory
     )
diff --git a/test/core/storage/chain/chain_store/CMakeLists.txt b/test/core/storage/chain/chain_store/CMakeLists.txt
index 8c1047bae2..7d4449b6c9 100644
--- a/test/core/storage/chain/chain_store/CMakeLists.txt
+++ b/test/core/storage/chain/chain_store/CMakeLists.txt
@@ -1,14 +1,14 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(chain_store_test
+addtest(filecoin_chain_store_test
     chain_store_test.cpp
     )
-target_link_libraries(chain_store_test
-    chain_data_store
-    chain_randomness_provider
-    chain_store
-    block_validator
-    ipfs_datastore_in_memory
-    weight_calculator
+target_link_libraries(filecoin_chain_store_test
+    filecoin_chain_data_store
+    filecoin_chain_randomness_provider
+    filecoin_chain_store
+    filecoin_block_validator
+    filecoin_ipfs_datastore_in_memory
+    filecoin_weight_calculator
     )
diff --git a/test/core/storage/chain/datastore_key/CMakeLists.txt b/test/core/storage/chain/datastore_key/CMakeLists.txt
index 24c43f146a..ac08ab4475 100644
--- a/test/core/storage/chain/datastore_key/CMakeLists.txt
+++ b/test/core/storage/chain/datastore_key/CMakeLists.txt
@@ -1,24 +1,24 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(datastore_key_cbor_test
+addtest(filecoin_datastore_key_cbor_test
     datastore_key_cbor_test.cpp
     )
-target_link_libraries(datastore_key_cbor_test
-    cbor
-    datastore_key
+target_link_libraries(filecoin_datastore_key_cbor_test
+    filecoin_cbor
+    filecoin_datastore_key
     )
 
-addtest(datastore_key_compare_test
+addtest(filecoin_datastore_key_compare_test
     datastore_key_compare_test.cpp
     )
-target_link_libraries(datastore_key_compare_test
-    datastore_key
+target_link_libraries(filecoin_datastore_key_compare_test
+    filecoin_datastore_key
     )
 
-addtest(datastore_key_create_test
+addtest(filecoin_datastore_key_create_test
     datastore_key_create_test.cpp
     )
-target_link_libraries(datastore_key_create_test
-    datastore_key
+target_link_libraries(filecoin_datastore_key_create_test
+    filecoin_datastore_key
     )
diff --git a/test/core/storage/config/CMakeLists.txt b/test/core/storage/config/CMakeLists.txt
index 93b1271378..c0159a4667 100644
--- a/test/core/storage/config/CMakeLists.txt
+++ b/test/core/storage/config/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(config_test
+addtest(filecoin_config_test
     config_test.cpp
     )
-target_link_libraries(config_test
-    base_fs_test
-    config
+target_link_libraries(filecoin_config_test
+    filecoin_base_fs_test
+    filecoin_config
     )
diff --git a/test/core/storage/filestore/CMakeLists.txt b/test/core/storage/filestore/CMakeLists.txt
index d0e081d81a..4cf28d4ebf 100644
--- a/test/core/storage/filestore/CMakeLists.txt
+++ b/test/core/storage/filestore/CMakeLists.txt
@@ -1,11 +1,11 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(filestore_test
+addtest(filecoin_filestore_test
     filesystem/filesystem_file_test.cpp
     filesystem/filesystem_filestore_test.cpp
     )
-target_link_libraries(filestore_test
-    base_fs_test
-    filestore
+target_link_libraries(filecoin_filestore_test
+    filecoin_base_fs_test
+    filecoin_filestore
     )
diff --git a/test/core/storage/hamt/CMakeLists.txt b/test/core/storage/hamt/CMakeLists.txt
index 8a2cc294cb..c3f4adc9bd 100644
--- a/test/core/storage/hamt/CMakeLists.txt
+++ b/test/core/storage/hamt/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(hamt_test
+addtest(filecoin_hamt_test
     hamt_test.cpp
     )
-target_link_libraries(hamt_test
-    hamt
-    hexutil
-    ipfs_datastore_in_memory
+target_link_libraries(filecoin_hamt_test
+    filecoin_hamt
+    filecoin_hexutil
+    filecoin_ipfs_datastore_in_memory
     )
diff --git a/test/core/storage/ipfs/CMakeLists.txt b/test/core/storage/ipfs/CMakeLists.txt
index d3a54bda63..6c3cd2bd8c 100644
--- a/test/core/storage/ipfs/CMakeLists.txt
+++ b/test/core/storage/ipfs/CMakeLists.txt
@@ -1,28 +1,28 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(datastore_integration_test
+addtest(filecoin_datastore_integration_test
     datastore_integration_test.cpp
     )
-target_link_libraries(datastore_integration_test
+target_link_libraries(filecoin_datastore_integration_test
     p2p::p2p_random_generator
-    ipfs_datastore_leveldb
+    filecoin_ipfs_datastore_leveldb
     )
 
-addtest(in_memory_ipfs_datastore_test
+addtest(filecoin_in_memory_ipfs_datastore_test
     in_memory_ipfs_datastore_test.cpp
     )
-target_link_libraries(in_memory_ipfs_datastore_test
+target_link_libraries(filecoin_in_memory_ipfs_datastore_test
     p2p::p2p_random_generator
-    ipfs_datastore_in_memory
+    filecoin_ipfs_datastore_in_memory
     )
 
-addtest(ipfs_blockservice_test
+addtest(filecoin_ipfs_blockservice_test
     ipfs_block_service_test.cpp
     )
-target_link_libraries(ipfs_blockservice_test
-    ipfs_blockservice
-    ipfs_datastore_in_memory
+target_link_libraries(filecoin_ipfs_blockservice_test
+    filecoin_ipfs_blockservice
+    filecoin_ipfs_datastore_in_memory
     )
 
 add_subdirectory(merkledag)
diff --git a/test/core/storage/ipfs/merkledag/CMakeLists.txt b/test/core/storage/ipfs/merkledag/CMakeLists.txt
index f381797813..900306cd54 100644
--- a/test/core/storage/ipfs/merkledag/CMakeLists.txt
+++ b/test/core/storage/ipfs/merkledag/CMakeLists.txt
@@ -1,7 +1,7 @@
-addtest(ipfs_merkledag_service_test
+addtest(filecoin_ipfs_merkledag_service_test
     ipfs_merkledag_service_test.cpp
     )
-target_link_libraries(ipfs_merkledag_service_test
-    ipfs_merkledag_service
-    buffer
+target_link_libraries(filecoin_ipfs_merkledag_service_test
+    filecoin_ipfs_merkledag_service
+    filecoin_buffer
     )
diff --git a/test/core/storage/keystore/CMakeLists.txt b/test/core/storage/keystore/CMakeLists.txt
index 06ac99d5ac..75851b8856 100644
--- a/test/core/storage/keystore/CMakeLists.txt
+++ b/test/core/storage/keystore/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(keystore_test
+addtest(filecoin_keystore_test
     filesystem_keystore_test.cpp
     in_memory_keystore_test.cpp
     )
-target_link_libraries(keystore_test
-    address
-    base_fs_test
-    keystore
+target_link_libraries(filecoin_keystore_test
+    filecoin_address
+    filecoin_base_fs_test
+    filecoin_keystore
     )
diff --git a/test/core/storage/leveldb/CMakeLists.txt b/test/core/storage/leveldb/CMakeLists.txt
index 7e06fd36a6..e6440510c9 100644
--- a/test/core/storage/leveldb/CMakeLists.txt
+++ b/test/core/storage/leveldb/CMakeLists.txt
@@ -1,19 +1,19 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(leveldb_fs_test
+addtest(filecoin_leveldb_fs_test
     leveldb_fs_test.cpp
     )
-target_link_libraries(leveldb_fs_test
-    leveldb
-    base_fs_test
+target_link_libraries(filecoin_leveldb_fs_test
+    filecoin_leveldb
+    filecoin_base_fs_test
     )
 
-addtest(leveldb_integration_test
+addtest(filecoin_leveldb_integration_test
     leveldb_integration_test.cpp
     )
-target_link_libraries(leveldb_integration_test
-    leveldb
-    base_leveldb_test
+target_link_libraries(filecoin_leveldb_integration_test
+    filecoin_leveldb
+    filecoin_base_leveldb_test
     Boost::filesystem
     )
diff --git a/test/core/storage/repository/CMakeLists.txt b/test/core/storage/repository/CMakeLists.txt
index 76d9b00fb7..fbf5c4fcf7 100644
--- a/test/core/storage/repository/CMakeLists.txt
+++ b/test/core/storage/repository/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-addtest(filesystem_repository_test
+addtest(filecoin_filesystem_repository_test
     filesystem_repository_test.cpp
     )
-target_link_libraries(filesystem_repository_test
-    filesystem_repository
-    base_fs_test
+target_link_libraries(filecoin_filesystem_repository_test
+    filecoin_filesystem_repository
+    filecoin_base_fs_test
     )
diff --git a/test/core/vm/actor/CMakeLists.txt b/test/core/vm/actor/CMakeLists.txt
index 151e929dc7..e141d5e9ba 100644
--- a/test/core/vm/actor/CMakeLists.txt
+++ b/test/core/vm/actor/CMakeLists.txt
@@ -5,18 +5,18 @@
 
 add_subdirectory(builtin)
 
-addtest(actor_test
+addtest(filecoin_actor_test
     actor_test.cpp
     )
-target_link_libraries(actor_test
-    actor
-    hexutil
+target_link_libraries(filecoin_actor_test
+    filecoin_actor
+    filecoin_hexutil
     )
 
-addtest(invoker_test
+addtest(filecoin_invoker_test
     invoker_test.cpp
     )
-target_link_libraries(invoker_test
-    actor
-    hamt
+target_link_libraries(filecoin_invoker_test
+    filecoin_actor
+    filecoin_hamt
     )
diff --git a/test/core/vm/actor/builtin/account/CMakeLists.txt b/test/core/vm/actor/builtin/account/CMakeLists.txt
index 485c554299..cb690b9496 100644
--- a/test/core/vm/actor/builtin/account/CMakeLists.txt
+++ b/test/core/vm/actor/builtin/account/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(account_actor_test
+addtest(filecoin_account_actor_test
     account_actor_test.cpp
     )
-target_link_libraries(account_actor_test
-    account_actor
-    state_tree
-    ipfs_datastore_in_memory
+target_link_libraries(filecoin_account_actor_test
+    filecoin_account_actor
+    filecoin_state_tree
+    filecoin_ipfs_datastore_in_memory
     )
diff --git a/test/core/vm/actor/builtin/cron/CMakeLists.txt b/test/core/vm/actor/builtin/cron/CMakeLists.txt
index e1f3ab96a2..433c2896fa 100644
--- a/test/core/vm/actor/builtin/cron/CMakeLists.txt
+++ b/test/core/vm/actor/builtin/cron/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(cron_actor_test
+addtest(filecoin_cron_actor_test
     cron_actor_test.cpp
     )
-target_link_libraries(cron_actor_test
-    cron_actor
+target_link_libraries(filecoin_cron_actor_test
+    filecoin_cron_actor
     )
diff --git a/test/core/vm/actor/builtin/init/CMakeLists.txt b/test/core/vm/actor/builtin/init/CMakeLists.txt
index 23572474bb..3e23252006 100644
--- a/test/core/vm/actor/builtin/init/CMakeLists.txt
+++ b/test/core/vm/actor/builtin/init/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(init_actor_test
+addtest(filecoin_init_actor_test
     init_actor_test.cpp
     )
-target_link_libraries(init_actor_test
-    init_actor
-    ipfs_datastore_in_memory
-    state_tree
+target_link_libraries(filecoin_init_actor_test
+    filecoin_init_actor
+    filecoin_ipfs_datastore_in_memory
+    filecoin_state_tree
     )
diff --git a/test/core/vm/actor/builtin/miner/CMakeLists.txt b/test/core/vm/actor/builtin/miner/CMakeLists.txt
index ec6ab2b52b..dc745784b1 100644
--- a/test/core/vm/actor/builtin/miner/CMakeLists.txt
+++ b/test/core/vm/actor/builtin/miner/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(miner_actor_test
+addtest(filecoin_miner_actor_test
     miner_actor_test.cpp
     )
-target_link_libraries(miner_actor_test
-    miner_actor
+target_link_libraries(filecoin_miner_actor_test
+    filecoin_miner_actor
     )
diff --git a/test/core/vm/actor/builtin/multisig_actor/CMakeLists.txt b/test/core/vm/actor/builtin/multisig_actor/CMakeLists.txt
index a1b70066ec..928c622eab 100644
--- a/test/core/vm/actor/builtin/multisig_actor/CMakeLists.txt
+++ b/test/core/vm/actor/builtin/multisig_actor/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(multisig_actor_test
+addtest(filecoin_multisig_actor_test
     multisig_actor_test.cpp
     )
-target_link_libraries(multisig_actor_test
-    multisig_actor
+target_link_libraries(filecoin_multisig_actor_test
+    filecoin_multisig_actor
     )
diff --git a/test/core/vm/actor/builtin/payment_channel/CMakeLists.txt b/test/core/vm/actor/builtin/payment_channel/CMakeLists.txt
index 3c2d3a68bf..f28c45e34a 100644
--- a/test/core/vm/actor/builtin/payment_channel/CMakeLists.txt
+++ b/test/core/vm/actor/builtin/payment_channel/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(payment_channel_actor_test
+addtest(filecoin_payment_channel_actor_test
     payment_channel_actor_test.cpp
     )
-target_link_libraries(payment_channel_actor_test
-    payment_channel_actor
+target_link_libraries(filecoin_payment_channel_actor_test
+    filecoin_payment_channel_actor
     )
diff --git a/test/core/vm/actor/builtin/storage_power/CMakeLists.txt b/test/core/vm/actor/builtin/storage_power/CMakeLists.txt
index 09272729df..acaf5ce8af 100644
--- a/test/core/vm/actor/builtin/storage_power/CMakeLists.txt
+++ b/test/core/vm/actor/builtin/storage_power/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(storage_power_actor_test
+addtest(filecoin_storage_power_actor_test
     storage_power_actor_test.cpp
     storage_power_actor_state_test.cpp
     )
-target_link_libraries(storage_power_actor_test
-    storage_power_actor
-    ipfs_datastore_in_memory
+target_link_libraries(filecoin_storage_power_actor_test
+    filecoin_storage_power_actor
+    filecoin_ipfs_datastore_in_memory
     )
diff --git a/test/core/vm/exit_code/CMakeLists.txt b/test/core/vm/exit_code/CMakeLists.txt
index dc78911d27..8a5ea9eda6 100644
--- a/test/core/vm/exit_code/CMakeLists.txt
+++ b/test/core/vm/exit_code/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(exit_code_test
+addtest(filecoin_exit_code_test
     exit_code_test.cpp
     )
-target_link_libraries(exit_code_test
-    exit_code
+target_link_libraries(filecoin_exit_code_test
+    filecoin_exit_code
     )
diff --git a/test/core/vm/message/CMakeLists.txt b/test/core/vm/message/CMakeLists.txt
index c57753fb94..0d48a10ed7 100644
--- a/test/core/vm/message/CMakeLists.txt
+++ b/test/core/vm/message/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(message_test
+addtest(filecoin_message_test
     message_test.cpp
     )
-target_link_libraries(message_test
-    message
+target_link_libraries(filecoin_message_test
+    filecoin_message
     )
diff --git a/test/core/vm/runtime/CMakeLists.txt b/test/core/vm/runtime/CMakeLists.txt
index 1febb8312d..627b6ae95f 100644
--- a/test/core/vm/runtime/CMakeLists.txt
+++ b/test/core/vm/runtime/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(runtime_test
+addtest(filecoin_runtime_test
     runtime_test.cpp
     )
-target_link_libraries(runtime_test
-    runtime
-    hamt
+target_link_libraries(filecoin_runtime_test
+    filecoin_runtime
+    filecoin_hamt
     )
diff --git a/test/core/vm/state/CMakeLists.txt b/test/core/vm/state/CMakeLists.txt
index 79f28e8ac7..11b8429070 100644
--- a/test/core/vm/state/CMakeLists.txt
+++ b/test/core/vm/state/CMakeLists.txt
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-addtest(state_tree_test
+addtest(filecoin_state_tree_test
     state_tree_test.cpp
     )
-target_link_libraries(state_tree_test
-    hexutil
-    ipfs_datastore_in_memory
-    state_tree
+target_link_libraries(filecoin_state_tree_test
+    filecoin_hexutil
+    filecoin_ipfs_datastore_in_memory
+    filecoin_state_tree
     )
diff --git a/test/testutil/primitives/ticket/CMakeLists.txt b/test/testutil/primitives/ticket/CMakeLists.txt
index ac37979ae2..e2fe963853 100644
--- a/test/testutil/primitives/ticket/CMakeLists.txt
+++ b/test/testutil/primitives/ticket/CMakeLists.txt
@@ -1,22 +1,22 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(ticket_generator
+add_library(filecoin_ticket_generator
     ticket_generator.cpp
     )
-target_link_libraries(ticket_generator
+target_link_libraries(filecoin_ticket_generator
     p2p::p2p_random_generator
-    blob
-    buffer
-    tickets
+    filecoin_blob
+    filecoin_buffer
+    filecoin_tickets
     )
 
-add_library(ticket_printer
+add_library(filecoin_ticket_printer
     printer.cpp
     )
-target_link_libraries(ticket_printer
+target_link_libraries(filecoin_ticket_printer
     Boost::boost
-    blob
-    buffer
-    tickets
+    filecoin_blob
+    filecoin_buffer
+    filecoin_tickets
     )
diff --git a/test/testutil/storage/CMakeLists.txt b/test/testutil/storage/CMakeLists.txt
index 4f05e73707..9bdde150c0 100644
--- a/test/testutil/storage/CMakeLists.txt
+++ b/test/testutil/storage/CMakeLists.txt
@@ -1,30 +1,30 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(base_fs_test
+add_library(filecoin_base_fs_test
     base_fs_test.hpp
     base_fs_test.cpp
     )
-target_link_libraries(base_fs_test
+target_link_libraries(filecoin_base_fs_test
     Boost::filesystem
     Boost::boost
-    logger
+    filecoin_logger
     )
 
-add_library(base_leveldb_test
+add_library(filecoin_base_leveldb_test
     base_leveldb_test.hpp
     base_leveldb_test.cpp
     )
-target_link_libraries(base_leveldb_test
-    base_fs_test
+target_link_libraries(filecoin_base_leveldb_test
+    filecoin_base_fs_test
     Boost::filesystem
     Boost::boost
-    logger
-    leveldb
+    filecoin_logger
+    filecoin_leveldb
     )
 
-add_library(std_list_adapter INTERFACE)
+add_library(filecoin_std_list_adapter INTERFACE)
 
-target_link_libraries(std_list_adapter INTERFACE
-    outcome
+target_link_libraries(filecoin_std_list_adapter INTERFACE
+    filecoin_outcome
     )
diff --git a/test/testutil/vm/message/CMakeLists.txt b/test/testutil/vm/message/CMakeLists.txt
index 972b084f90..abca8738d5 100644
--- a/test/testutil/vm/message/CMakeLists.txt
+++ b/test/testutil/vm/message/CMakeLists.txt
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(message_test_util
+add_library(filecoin_message_test_util
     message_test_util.cpp
     )
-target_link_libraries(message_test_util
-    message
+target_link_libraries(filecoin_message_test_util
+    filecoin_message
     )

From e8255aa43ac016171a7e6e611e1de22c1d63e76c Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 22 Feb 2020 15:54:05 -0800
Subject: [PATCH 12/13] CMake: Add install step for libraries

---
 CMakeLists.txt                                |  2 ++
 cmake/filecoin_functions.cmake                | 13 +++++++++++
 cmake/install.cmake                           | 23 +++++++++++++++++++
 core/adt/CMakeLists.txt                       |  6 ++---
 core/blockchain/CMakeLists.txt                |  4 ++--
 core/blockchain/message_pool/CMakeLists.txt   |  2 +-
 core/blockchain/production/CMakeLists.txt     |  2 +-
 core/clock/CMakeLists.txt                     |  2 +-
 core/codec/cbor/CMakeLists.txt                |  2 +-
 core/codec/rle/CMakeLists.txt                 |  7 +++++-
 core/common/CMakeLists.txt                    | 10 ++++----
 core/crypto/blake2/CMakeLists.txt             |  2 +-
 core/crypto/bls/CMakeLists.txt                |  2 +-
 core/crypto/hasher/CMakeLists.txt             |  2 +-
 core/crypto/murmur/CMakeLists.txt             |  2 +-
 core/crypto/randomness/CMakeLists.txt         |  4 ++--
 core/crypto/signature/CMakeLists.txt          |  2 +-
 core/crypto/vrf/CMakeLists.txt                |  2 +-
 core/fslock/CMakeLists.txt                    |  2 +-
 core/power/CMakeLists.txt                     |  4 ++--
 core/primitives/address/CMakeLists.txt        |  2 +-
 core/primitives/block/CMakeLists.txt          |  2 +-
 core/primitives/chain/CMakeLists.txt          |  2 +-
 core/primitives/chain_epoch/CMakeLists.txt    |  2 +-
 core/primitives/cid/CMakeLists.txt            |  4 ++--
 core/primitives/piece/CMakeLists.txt          |  2 +-
 core/primitives/rle_bitset/CMakeLists.txt     |  2 +-
 core/primitives/ticket/CMakeLists.txt         |  2 +-
 core/primitives/tipset/CMakeLists.txt         |  2 +-
 core/proofs/CMakeLists.txt                    |  4 ++--
 core/storage/amt/CMakeLists.txt               |  2 +-
 core/storage/chain/CMakeLists.txt             |  6 ++---
 core/storage/config/CMakeLists.txt            |  2 +-
 core/storage/filestore/CMakeLists.txt         |  2 +-
 core/storage/hamt/CMakeLists.txt              |  2 +-
 core/storage/in_memory/CMakeLists.txt         |  2 +-
 core/storage/ipfs/CMakeLists.txt              |  6 ++---
 core/storage/ipfs/merkledag/CMakeLists.txt    |  2 +-
 core/storage/ipld/CMakeLists.txt              |  8 +++----
 core/storage/keystore/CMakeLists.txt          |  2 +-
 core/storage/leveldb/CMakeLists.txt           |  2 +-
 core/storage/repository/CMakeLists.txt        |  6 ++---
 core/vm/actor/CMakeLists.txt                  |  2 +-
 core/vm/actor/builtin/account/CMakeLists.txt  |  2 +-
 core/vm/actor/builtin/cron/CMakeLists.txt     |  2 +-
 core/vm/actor/builtin/init/CMakeLists.txt     |  2 +-
 core/vm/actor/builtin/miner/CMakeLists.txt    |  2 +-
 core/vm/actor/builtin/multisig/CMakeLists.txt |  2 +-
 .../builtin/payment_channel/CMakeLists.txt    |  2 +-
 core/vm/actor/builtin/reward/CMakeLists.txt   |  2 +-
 core/vm/actor/builtin/shared/CMakeLists.txt   |  2 +-
 .../builtin/storage_power/CMakeLists.txt      |  2 +-
 core/vm/exit_code/CMakeLists.txt              |  2 +-
 core/vm/indices/CMakeLists.txt                |  2 +-
 core/vm/interpreter/CMakeLists.txt            |  2 +-
 core/vm/message/CMakeLists.txt                |  2 +-
 core/vm/runtime/CMakeLists.txt                |  2 +-
 core/vm/state/CMakeLists.txt                  |  2 +-
 deps/tinycbor.cmake                           |  2 +-
 .../testutil/primitives/ticket/CMakeLists.txt |  4 ++--
 test/testutil/storage/CMakeLists.txt          |  6 ++---
 test/testutil/vm/message/CMakeLists.txt       |  2 +-
 62 files changed, 125 insertions(+), 82 deletions(-)
 create mode 100644 cmake/filecoin_functions.cmake
 create mode 100644 cmake/install.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afb83be832..a36915fb96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,8 @@ option(TSAN "Enable thread sanitizer" OFF)
 option(UBSAN "Enable UB sanitizer" OFF)
 
 include(CheckCXXCompilerFlag)
+include(cmake/install.cmake)
+include(cmake/filecoin_functions.cmake)
 include(cmake/toolchain-util.cmake)
 include(cmake/dependencies.cmake)
 include(cmake/functions.cmake)
diff --git a/cmake/filecoin_functions.cmake b/cmake/filecoin_functions.cmake
new file mode 100644
index 0000000000..e588ca9261
--- /dev/null
+++ b/cmake/filecoin_functions.cmake
@@ -0,0 +1,13 @@
+#
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include(GNUInstallDirs)
+
+function(filecoin_add_library target)
+  add_library(${target}
+      ${ARGN}
+      )
+  filecoin_install(${target})
+endfunction()
diff --git a/cmake/install.cmake b/cmake/install.cmake
new file mode 100644
index 0000000000..774cdb39c7
--- /dev/null
+++ b/cmake/install.cmake
@@ -0,0 +1,23 @@
+#
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include(GNUInstallDirs)
+
+function (filecoin_install targets)
+  install(TARGETS ${targets} EXPORT filecoinConfig
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+      INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+      PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+      FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX}
+      )
+endfunction()
+
+install(
+    EXPORT filecoinConfig
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/filecoin
+    NAMESPACE filecoin::
+)
diff --git a/core/adt/CMakeLists.txt b/core/adt/CMakeLists.txt
index c16dcffd21..f5f5d1484d 100644
--- a/core/adt/CMakeLists.txt
+++ b/core/adt/CMakeLists.txt
@@ -9,14 +9,14 @@ add_custom_target(filecoin_adt
     filecoin_multimap
     )
 
-add_library(filecoin_array
+filecoin_add_library(filecoin_array
     impl/array.cpp
     )
 target_link_libraries(filecoin_array
     filecoin_amt
     )
 
-add_library(filecoin_balance_table_hamt
+filecoin_add_library(filecoin_balance_table_hamt
     impl/balance_table_hamt.cpp
     )
 target_link_libraries(filecoin_balance_table_hamt
@@ -24,7 +24,7 @@ target_link_libraries(filecoin_balance_table_hamt
     filecoin_hamt
     )
 
-add_library(filecoin_multimap
+filecoin_add_library(filecoin_multimap
     impl/multimap.cpp
     )
 target_link_libraries(filecoin_multimap
diff --git a/core/blockchain/CMakeLists.txt b/core/blockchain/CMakeLists.txt
index d776493d2e..098ab375f3 100644
--- a/core/blockchain/CMakeLists.txt
+++ b/core/blockchain/CMakeLists.txt
@@ -6,14 +6,14 @@
 add_subdirectory(message_pool)
 add_subdirectory(production)
 
-add_library(filecoin_block_validator
+filecoin_add_library(filecoin_block_validator
     impl/block_validator_impl.cpp
     )
 target_link_libraries(filecoin_block_validator
     filecoin_block
     )
 
-add_library(filecoin_weight_calculator
+filecoin_add_library(filecoin_weight_calculator
     impl/weight_calculator_impl.cpp
     )
 target_link_libraries(filecoin_weight_calculator
diff --git a/core/blockchain/message_pool/CMakeLists.txt b/core/blockchain/message_pool/CMakeLists.txt
index 39191d9b67..f400f0e984 100644
--- a/core/blockchain/message_pool/CMakeLists.txt
+++ b/core/blockchain/message_pool/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_message_pool
+filecoin_add_library(filecoin_message_pool
     impl/gas_price_scored_message_storage.cpp
     impl/message_pool_error.cpp)
 target_link_libraries(filecoin_message_pool
diff --git a/core/blockchain/production/CMakeLists.txt b/core/blockchain/production/CMakeLists.txt
index 72adc4c726..9e3aad4d1c 100644
--- a/core/blockchain/production/CMakeLists.txt
+++ b/core/blockchain/production/CMakeLists.txt
@@ -3,7 +3,7 @@
 #SPDX - License - Identifier : Apache - 2.0
 #
 
-add_library(filecoin_block_producer
+filecoin_add_library(filecoin_block_producer
     impl/block_producer_impl.cpp
     )
 target_link_libraries(filecoin_block_producer
diff --git a/core/clock/CMakeLists.txt b/core/clock/CMakeLists.txt
index 5c35db40a3..14a41dae29 100644
--- a/core/clock/CMakeLists.txt
+++ b/core/clock/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_clock
+filecoin_add_library(filecoin_clock
     chain_epoch_clock.cpp
     impl/chain_epoch_clock_impl.cpp
     impl/utc_clock_impl.cpp
diff --git a/core/codec/cbor/CMakeLists.txt b/core/codec/cbor/CMakeLists.txt
index 2431e1f39a..ed0a2c70b2 100644
--- a/core/codec/cbor/CMakeLists.txt
+++ b/core/codec/cbor/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_cbor
+filecoin_add_library(filecoin_cbor
     cbor_decode_stream.cpp
     cbor_encode_stream.cpp
     cbor_errors.cpp
diff --git a/core/codec/rle/CMakeLists.txt b/core/codec/rle/CMakeLists.txt
index e263455690..04bff8aff8 100644
--- a/core/codec/rle/CMakeLists.txt
+++ b/core/codec/rle/CMakeLists.txt
@@ -1,4 +1,9 @@
-add_library(filecoin_rle_plus_codec
+#
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+filecoin_add_library(filecoin_rle_plus_codec
     rle_plus_encoding_stream.cpp
     rle_plus_errors.cpp
     )
diff --git a/core/common/CMakeLists.txt b/core/common/CMakeLists.txt
index d51c21e64d..182017e53d 100644
--- a/core/common/CMakeLists.txt
+++ b/core/common/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_hexutil
+filecoin_add_library(filecoin_hexutil
     hexutil.hpp
     hexutil.cpp
     )
@@ -12,7 +12,7 @@ target_link_libraries(filecoin_hexutil
     filecoin_outcome
     )
 
-add_library(filecoin_blob
+filecoin_add_library(filecoin_blob
     blob.hpp
     blob.cpp
     )
@@ -20,13 +20,13 @@ target_link_libraries(filecoin_blob
     filecoin_hexutil
     )
 
-add_library(filecoin_outcome INTERFACE)
+filecoin_add_library(filecoin_outcome INTERFACE)
 target_link_libraries(filecoin_outcome INTERFACE
     Boost::boost
     p2p::p2p
     )
 
-add_library(filecoin_buffer
+filecoin_add_library(filecoin_buffer
     buffer.hpp
     buffer.cpp
     buffer_back_insert_iterator.cpp
@@ -35,7 +35,7 @@ target_link_libraries(filecoin_buffer
     filecoin_hexutil
     )
 
-add_library(filecoin_logger
+filecoin_add_library(filecoin_logger
     logger.cpp
     )
 target_link_libraries(filecoin_logger
diff --git a/core/crypto/blake2/CMakeLists.txt b/core/crypto/blake2/CMakeLists.txt
index a3dbb88138..ea67377995 100644
--- a/core/crypto/blake2/CMakeLists.txt
+++ b/core/crypto/blake2/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_blake2
+filecoin_add_library(filecoin_blake2
     blake2s.c
     blake2b.c
     blake2b160.cpp
diff --git a/core/crypto/bls/CMakeLists.txt b/core/crypto/bls/CMakeLists.txt
index 52a292bf9d..87269318b4 100644
--- a/core/crypto/bls/CMakeLists.txt
+++ b/core/crypto/bls/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_bls_provider
+filecoin_add_library(filecoin_bls_provider
     impl/bls_provider_impl.cpp
     )
 
diff --git a/core/crypto/hasher/CMakeLists.txt b/core/crypto/hasher/CMakeLists.txt
index 0fe0a7efea..5861a9c3b7 100644
--- a/core/crypto/hasher/CMakeLists.txt
+++ b/core/crypto/hasher/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_hasher
+filecoin_add_library(filecoin_hasher
     hasher.cpp
     )
 target_link_libraries(filecoin_hasher
diff --git a/core/crypto/murmur/CMakeLists.txt b/core/crypto/murmur/CMakeLists.txt
index 23c6099371..7746c8cbda 100644
--- a/core/crypto/murmur/CMakeLists.txt
+++ b/core/crypto/murmur/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_murmur
+filecoin_add_library(filecoin_murmur
     murmur.cpp
     )
 target_link_libraries(filecoin_murmur
diff --git a/core/crypto/randomness/CMakeLists.txt b/core/crypto/randomness/CMakeLists.txt
index 7d28baa118..a9c31a4578 100644
--- a/core/crypto/randomness/CMakeLists.txt
+++ b/core/crypto/randomness/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_randomness_provider
+filecoin_add_library(filecoin_randomness_provider
     impl/randomness_provider_impl.cpp
     )
 target_link_libraries(filecoin_randomness_provider
@@ -11,7 +11,7 @@ target_link_libraries(filecoin_randomness_provider
     p2p::p2p_sha
     )
 
-add_library(filecoin_chain_randomness_provider
+filecoin_add_library(filecoin_chain_randomness_provider
     impl/chain_randomness_provider_impl.cpp
     )
 target_link_libraries(filecoin_chain_randomness_provider
diff --git a/core/crypto/signature/CMakeLists.txt b/core/crypto/signature/CMakeLists.txt
index f9dcbdf3a4..ae80f7bed1 100644
--- a/core/crypto/signature/CMakeLists.txt
+++ b/core/crypto/signature/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_signature
+filecoin_add_library(filecoin_signature
     signature.cpp
     )
 target_link_libraries(filecoin_signature
diff --git a/core/crypto/vrf/CMakeLists.txt b/core/crypto/vrf/CMakeLists.txt
index d1de58770d..e3d499a6f6 100644
--- a/core/crypto/vrf/CMakeLists.txt
+++ b/core/crypto/vrf/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_vrf_provider
+filecoin_add_library(filecoin_vrf_provider
     impl/vrf_provider_impl.cpp
     vrf_hash_encoder.cpp
     vrf_types.cpp
diff --git a/core/fslock/CMakeLists.txt b/core/fslock/CMakeLists.txt
index 54012d0270..cb235c4bd0 100644
--- a/core/fslock/CMakeLists.txt
+++ b/core/fslock/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_fslock
+filecoin_add_library(filecoin_fslock
         fslock.cpp
         fslock_error.cpp
         )
diff --git a/core/power/CMakeLists.txt b/core/power/CMakeLists.txt
index 05a7e94b3b..e443c77258 100644
--- a/core/power/CMakeLists.txt
+++ b/core/power/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_power_table
+filecoin_add_library(filecoin_power_table
     impl/power_table_impl.cpp
     impl/power_table_error.cpp
     )
@@ -10,7 +10,7 @@ target_link_libraries(filecoin_power_table
     filecoin_outcome
     )
 
-add_library(filecoin_power_table_hamt
+filecoin_add_library(filecoin_power_table_hamt
     impl/power_table_hamt.cpp
     impl/power_table_error.cpp
     )
diff --git a/core/primitives/address/CMakeLists.txt b/core/primitives/address/CMakeLists.txt
index a0e88f03f3..66f9bab08e 100644
--- a/core/primitives/address/CMakeLists.txt
+++ b/core/primitives/address/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_address
+filecoin_add_library(filecoin_address
     address.cpp
     address_codec.cpp
         ../piece/piece.hpp ../piece/piece.hpp)
diff --git a/core/primitives/block/CMakeLists.txt b/core/primitives/block/CMakeLists.txt
index 77a91d246a..8b0fb480bf 100644
--- a/core/primitives/block/CMakeLists.txt
+++ b/core/primitives/block/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_block INTERFACE)
+filecoin_add_library(filecoin_block INTERFACE)
 target_link_libraries(filecoin_block INTERFACE
     filecoin_address
     filecoin_cbor
diff --git a/core/primitives/chain/CMakeLists.txt b/core/primitives/chain/CMakeLists.txt
index 0c72eda61b..93f5efec8a 100644
--- a/core/primitives/chain/CMakeLists.txt
+++ b/core/primitives/chain/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_chain
+filecoin_add_library(filecoin_chain
     chain.cpp
     )
 target_link_libraries(filecoin_chain
diff --git a/core/primitives/chain_epoch/CMakeLists.txt b/core/primitives/chain_epoch/CMakeLists.txt
index a0c030cb4b..20c67361e8 100644
--- a/core/primitives/chain_epoch/CMakeLists.txt
+++ b/core/primitives/chain_epoch/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_chain_epoch_codec
+filecoin_add_library(filecoin_chain_epoch_codec
     chain_epoch_codec.cpp
     )
 target_link_libraries(filecoin_chain_epoch_codec
diff --git a/core/primitives/cid/CMakeLists.txt b/core/primitives/cid/CMakeLists.txt
index 479efc15cd..7f63f5546a 100644
--- a/core/primitives/cid/CMakeLists.txt
+++ b/core/primitives/cid/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_cid
+filecoin_add_library(filecoin_cid
     cid.cpp
     json_codec.cpp
     )
@@ -15,7 +15,7 @@ target_link_libraries(filecoin_cid
     p2p::p2p_cid
     )
 
-add_library(filecoin_comm_cid
+filecoin_add_library(filecoin_comm_cid
     comm_cid.cpp
     comm_cid_errors.cpp
     )
diff --git a/core/primitives/piece/CMakeLists.txt b/core/primitives/piece/CMakeLists.txt
index 491dc3769a..58740b0816 100644
--- a/core/primitives/piece/CMakeLists.txt
+++ b/core/primitives/piece/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_piece
+filecoin_add_library(filecoin_piece
         piece.cpp
         piece_error.cpp
         )
diff --git a/core/primitives/rle_bitset/CMakeLists.txt b/core/primitives/rle_bitset/CMakeLists.txt
index c980d1fcce..9a7f4f88d2 100644
--- a/core/primitives/rle_bitset/CMakeLists.txt
+++ b/core/primitives/rle_bitset/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_rle_bitset INTERFACE)
+filecoin_add_library(filecoin_rle_bitset INTERFACE)
 target_link_libraries(filecoin_rle_bitset INTERFACE
     filecoin_cbor
     filecoin_rle_plus_codec
diff --git a/core/primitives/ticket/CMakeLists.txt b/core/primitives/ticket/CMakeLists.txt
index e7fdb845b7..0739e2e4a1 100644
--- a/core/primitives/ticket/CMakeLists.txt
+++ b/core/primitives/ticket/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_tickets
+filecoin_add_library(filecoin_tickets
     ticket.cpp
     epost_ticket.cpp
     ticket_codec.cpp
diff --git a/core/primitives/tipset/CMakeLists.txt b/core/primitives/tipset/CMakeLists.txt
index aa5aa40ccb..68fe12f5e5 100644
--- a/core/primitives/tipset/CMakeLists.txt
+++ b/core/primitives/tipset/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_tipset
+filecoin_add_library(filecoin_tipset
     tipset.cpp
     tipset_key.cpp
     )
diff --git a/core/proofs/CMakeLists.txt b/core/proofs/CMakeLists.txt
index 9d65bccb99..f0554fae15 100644
--- a/core/proofs/CMakeLists.txt
+++ b/core/proofs/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_proof_param_provider
+filecoin_add_library(filecoin_proof_param_provider
         proof_param_provider.cpp
         proof_param_provider_error.cpp
         )
@@ -26,7 +26,7 @@ add_custom_command(
         ${CMAKE_CURRENT_SOURCE_DIR}/parameters.json
         /var/tmp/filecoin-proof-parameters/parameters.json)
 
-add_library(filecoin_proofs
+filecoin_add_library(filecoin_proofs
         proofs.cpp
         proofs_error.cpp
         )
diff --git a/core/storage/amt/CMakeLists.txt b/core/storage/amt/CMakeLists.txt
index 3e201f36a4..b05d2d1eba 100644
--- a/core/storage/amt/CMakeLists.txt
+++ b/core/storage/amt/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_amt
+filecoin_add_library(filecoin_amt
     amt.cpp
     )
 target_link_libraries(filecoin_amt
diff --git a/core/storage/chain/CMakeLists.txt b/core/storage/chain/CMakeLists.txt
index b7d684a2d0..1f9f406879 100644
--- a/core/storage/chain/CMakeLists.txt
+++ b/core/storage/chain/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_chain_store
+filecoin_add_library(filecoin_chain_store
     impl/chain_store_impl.cpp
     )
 target_link_libraries(filecoin_chain_store
@@ -11,7 +11,7 @@ target_link_libraries(filecoin_chain_store
     filecoin_logger
     )
 
-add_library(filecoin_datastore_key
+filecoin_add_library(filecoin_datastore_key
     datastore_key.cpp
     )
 target_link_libraries(filecoin_datastore_key
@@ -19,7 +19,7 @@ target_link_libraries(filecoin_datastore_key
     Boost::filesystem
     )
 
-add_library(filecoin_chain_data_store
+filecoin_add_library(filecoin_chain_data_store
     impl/chain_data_store_impl.cpp
     )
 target_link_libraries(filecoin_chain_data_store
diff --git a/core/storage/config/CMakeLists.txt b/core/storage/config/CMakeLists.txt
index 89b95903ab..e9cde7e5cf 100644
--- a/core/storage/config/CMakeLists.txt
+++ b/core/storage/config/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_config
+filecoin_add_library(filecoin_config
     config.cpp
     config_error.cpp
     )
diff --git a/core/storage/filestore/CMakeLists.txt b/core/storage/filestore/CMakeLists.txt
index c109e569d7..79a1519d53 100644
--- a/core/storage/filestore/CMakeLists.txt
+++ b/core/storage/filestore/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_filestore
+filecoin_add_library(filecoin_filestore
     filestore_error.cpp
     impl/filesystem/filesystem_file.cpp
     impl/filesystem/filesystem_filestore.cpp
diff --git a/core/storage/hamt/CMakeLists.txt b/core/storage/hamt/CMakeLists.txt
index 99c9db030d..e83bf07c6a 100644
--- a/core/storage/hamt/CMakeLists.txt
+++ b/core/storage/hamt/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_hamt
+filecoin_add_library(filecoin_hamt
     hamt.cpp
     )
 target_link_libraries(filecoin_hamt
diff --git a/core/storage/in_memory/CMakeLists.txt b/core/storage/in_memory/CMakeLists.txt
index d71ac54b8c..309df9041a 100644
--- a/core/storage/in_memory/CMakeLists.txt
+++ b/core/storage/in_memory/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_in_memory_storage
+filecoin_add_library(filecoin_in_memory_storage
     in_memory_storage.cpp
     )
 target_link_libraries(filecoin_in_memory_storage
diff --git a/core/storage/ipfs/CMakeLists.txt b/core/storage/ipfs/CMakeLists.txt
index 2b73ca4860..9962f6abd4 100644
--- a/core/storage/ipfs/CMakeLists.txt
+++ b/core/storage/ipfs/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
-add_library(filecoin_ipfs_datastore_in_memory
+filecoin_add_library(filecoin_ipfs_datastore_in_memory
     impl/in_memory_datastore.cpp
     impl/ipfs_datastore_error.cpp
     )
@@ -12,7 +12,7 @@ target_link_libraries(filecoin_ipfs_datastore_in_memory
     filecoin_cid
     )
 
-add_library(filecoin_ipfs_datastore_leveldb
+filecoin_add_library(filecoin_ipfs_datastore_leveldb
     impl/datastore_leveldb.cpp
     impl/ipfs_datastore_error.cpp
     )
@@ -23,7 +23,7 @@ target_link_libraries(filecoin_ipfs_datastore_leveldb
     filecoin_leveldb
     )
 
-add_library(filecoin_ipfs_blockservice
+filecoin_add_library(filecoin_ipfs_blockservice
     impl/ipfs_block_service.cpp
     )
 target_link_libraries(filecoin_ipfs_blockservice
diff --git a/core/storage/ipfs/merkledag/CMakeLists.txt b/core/storage/ipfs/merkledag/CMakeLists.txt
index b6c1902030..b0b963b299 100644
--- a/core/storage/ipfs/merkledag/CMakeLists.txt
+++ b/core/storage/ipfs/merkledag/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_ipfs_merkledag_service
+filecoin_add_library(filecoin_ipfs_merkledag_service
     impl/merkledag_service_impl.cpp
     impl/leaf_impl.cpp
     )
diff --git a/core/storage/ipld/CMakeLists.txt b/core/storage/ipld/CMakeLists.txt
index c6b0b54af8..a9ecd61fe6 100644
--- a/core/storage/ipld/CMakeLists.txt
+++ b/core/storage/ipld/CMakeLists.txt
@@ -12,7 +12,7 @@ execute_process(COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --cpp_out=${PB_BUILD_DIR}
     RESULT_VARIABLE CMD_OUTPUT
     )
 
-add_library(filecoin_ipld_node_protobuf
+filecoin_add_library(filecoin_ipld_node_protobuf
     ${PB_BUILD_DIR}/ipld_node.pb.h
     ${PB_BUILD_DIR}/ipld_node.pb.cc
     )
@@ -22,20 +22,20 @@ target_link_libraries(filecoin_ipld_node_protobuf
     )
 disable_clang_tidy(filecoin_ipld_node_protobuf)
 
-add_library(filecoin_ipld_block INTERFACE)
+filecoin_add_library(filecoin_ipld_block INTERFACE)
 target_link_libraries(filecoin_ipld_block INTERFACE
     filecoin_cid
     filecoin_hasher
     )
 
-add_library(filecoin_ipld_link
+filecoin_add_library(filecoin_ipld_link
     impl/ipld_link_impl.cpp
     )
 target_link_libraries(filecoin_ipld_link
     filecoin_cid
     )
 
-add_library(filecoin_ipld_node
+filecoin_add_library(filecoin_ipld_node
     impl/ipld_node_impl.cpp
     impl/ipld_node_encoder_pb.cpp
     impl/ipld_node_decoder_pb.cpp
diff --git a/core/storage/keystore/CMakeLists.txt b/core/storage/keystore/CMakeLists.txt
index ce3cbe309e..31630f9e05 100644
--- a/core/storage/keystore/CMakeLists.txt
+++ b/core/storage/keystore/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_keystore
+filecoin_add_library(filecoin_keystore
     keystore.cpp
     keystore_error.cpp
     impl/filesystem/filesystem_keystore.cpp
diff --git a/core/storage/leveldb/CMakeLists.txt b/core/storage/leveldb/CMakeLists.txt
index bda3ed8e6e..e037638b73 100644
--- a/core/storage/leveldb/CMakeLists.txt
+++ b/core/storage/leveldb/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_leveldb
+filecoin_add_library(filecoin_leveldb
     leveldb.cpp
     leveldb_batch.cpp
     leveldb_error.cpp
diff --git a/core/storage/repository/CMakeLists.txt b/core/storage/repository/CMakeLists.txt
index 15d55f29c0..27eb2396b2 100644
--- a/core/storage/repository/CMakeLists.txt
+++ b/core/storage/repository/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_repository
+filecoin_add_library(filecoin_repository
     impl/repository.cpp
     impl/repository_error.cpp
     )
@@ -9,7 +9,7 @@ target_link_libraries(filecoin_repository
     filecoin_outcome
     )
 
-add_library(filecoin_filesystem_repository
+filecoin_add_library(filecoin_filesystem_repository
     impl/filesystem_repository.cpp
     )
 target_link_libraries(filecoin_filesystem_repository
@@ -22,7 +22,7 @@ target_link_libraries(filecoin_filesystem_repository
     filecoin_repository
     )
 
-add_library(filecoin_in_memory_repository
+filecoin_add_library(filecoin_in_memory_repository
     impl/in_memory_repository.cpp
     )
 target_link_libraries(filecoin_in_memory_repository
diff --git a/core/vm/actor/CMakeLists.txt b/core/vm/actor/CMakeLists.txt
index 198568946b..973f624d4e 100644
--- a/core/vm/actor/CMakeLists.txt
+++ b/core/vm/actor/CMakeLists.txt
@@ -5,7 +5,7 @@
 
 add_subdirectory(builtin)
 
-add_library(filecoin_actor
+filecoin_add_library(filecoin_actor
     actor.cpp
     impl/invoker_impl.cpp
     )
diff --git a/core/vm/actor/builtin/account/CMakeLists.txt b/core/vm/actor/builtin/account/CMakeLists.txt
index 5de920908a..9aacc0141d 100644
--- a/core/vm/actor/builtin/account/CMakeLists.txt
+++ b/core/vm/actor/builtin/account/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_account_actor
+filecoin_add_library(filecoin_account_actor
     account_actor.cpp
     )
 target_link_libraries(filecoin_account_actor
diff --git a/core/vm/actor/builtin/cron/CMakeLists.txt b/core/vm/actor/builtin/cron/CMakeLists.txt
index 536c3434f6..6d23f6cce4 100644
--- a/core/vm/actor/builtin/cron/CMakeLists.txt
+++ b/core/vm/actor/builtin/cron/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_cron_actor
+filecoin_add_library(filecoin_cron_actor
     cron_actor.cpp
     )
 target_link_libraries(filecoin_cron_actor
diff --git a/core/vm/actor/builtin/init/CMakeLists.txt b/core/vm/actor/builtin/init/CMakeLists.txt
index f7ce219020..6e69a63d1c 100644
--- a/core/vm/actor/builtin/init/CMakeLists.txt
+++ b/core/vm/actor/builtin/init/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_init_actor
+filecoin_add_library(filecoin_init_actor
     init_actor.cpp
     )
 target_link_libraries(filecoin_init_actor
diff --git a/core/vm/actor/builtin/miner/CMakeLists.txt b/core/vm/actor/builtin/miner/CMakeLists.txt
index e9460ff1aa..7638d6a2ff 100644
--- a/core/vm/actor/builtin/miner/CMakeLists.txt
+++ b/core/vm/actor/builtin/miner/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_miner_actor
+filecoin_add_library(filecoin_miner_actor
     miner_actor.cpp
     )
 target_link_libraries(filecoin_miner_actor
diff --git a/core/vm/actor/builtin/multisig/CMakeLists.txt b/core/vm/actor/builtin/multisig/CMakeLists.txt
index e97ad1c0ae..230c33a03e 100644
--- a/core/vm/actor/builtin/multisig/CMakeLists.txt
+++ b/core/vm/actor/builtin/multisig/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_multisig_actor
+filecoin_add_library(filecoin_multisig_actor
     multisig_actor.cpp
     )
 target_link_libraries(filecoin_multisig_actor
diff --git a/core/vm/actor/builtin/payment_channel/CMakeLists.txt b/core/vm/actor/builtin/payment_channel/CMakeLists.txt
index 90f83e02bd..5359f6aec9 100644
--- a/core/vm/actor/builtin/payment_channel/CMakeLists.txt
+++ b/core/vm/actor/builtin/payment_channel/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_payment_channel_actor
+filecoin_add_library(filecoin_payment_channel_actor
     payment_channel_actor.cpp
     )
 target_link_libraries(filecoin_payment_channel_actor
diff --git a/core/vm/actor/builtin/reward/CMakeLists.txt b/core/vm/actor/builtin/reward/CMakeLists.txt
index 87a97fbe01..ab652ecebf 100644
--- a/core/vm/actor/builtin/reward/CMakeLists.txt
+++ b/core/vm/actor/builtin/reward/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_reward_actor
+filecoin_add_library(filecoin_reward_actor
     reward_actor.cpp
     )
 target_link_libraries(filecoin_reward_actor
diff --git a/core/vm/actor/builtin/shared/CMakeLists.txt b/core/vm/actor/builtin/shared/CMakeLists.txt
index 5bf1dfced1..05fa866283 100644
--- a/core/vm/actor/builtin/shared/CMakeLists.txt
+++ b/core/vm/actor/builtin/shared/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_builtin_shared
+filecoin_add_library(filecoin_builtin_shared
     shared.cpp
     )
 target_link_libraries(filecoin_builtin_shared
diff --git a/core/vm/actor/builtin/storage_power/CMakeLists.txt b/core/vm/actor/builtin/storage_power/CMakeLists.txt
index e393cae0e1..d19392209c 100644
--- a/core/vm/actor/builtin/storage_power/CMakeLists.txt
+++ b/core/vm/actor/builtin/storage_power/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_storage_power_actor
+filecoin_add_library(filecoin_storage_power_actor
     storage_power_actor_state.cpp
     storage_power_actor_export.cpp
     policy.cpp
diff --git a/core/vm/exit_code/CMakeLists.txt b/core/vm/exit_code/CMakeLists.txt
index 9804af86b7..54702025bf 100644
--- a/core/vm/exit_code/CMakeLists.txt
+++ b/core/vm/exit_code/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_exit_code
+filecoin_add_library(filecoin_exit_code
     impl/exit_code.cpp
     )
 target_link_libraries(filecoin_exit_code
diff --git a/core/vm/indices/CMakeLists.txt b/core/vm/indices/CMakeLists.txt
index 40cb1feb7b..6e18b018ed 100644
--- a/core/vm/indices/CMakeLists.txt
+++ b/core/vm/indices/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_indices
+filecoin_add_library(filecoin_indices
     impl/indices_impl.cpp
     )
 target_link_libraries(filecoin_indices
diff --git a/core/vm/interpreter/CMakeLists.txt b/core/vm/interpreter/CMakeLists.txt
index 0253418f72..55aaccfcc1 100644
--- a/core/vm/interpreter/CMakeLists.txt
+++ b/core/vm/interpreter/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_interpreter
+filecoin_add_library(filecoin_interpreter
     impl/interpreter_impl.cpp
     )
 target_link_libraries(filecoin_interpreter
diff --git a/core/vm/message/CMakeLists.txt b/core/vm/message/CMakeLists.txt
index c5100a299b..4bac1b4499 100644
--- a/core/vm/message/CMakeLists.txt
+++ b/core/vm/message/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_message
+filecoin_add_library(filecoin_message
     message.cpp
     message_util.cpp
     impl/message_signer_impl.cpp
diff --git a/core/vm/runtime/CMakeLists.txt b/core/vm/runtime/CMakeLists.txt
index ff8f72e16a..454ce9f266 100644
--- a/core/vm/runtime/CMakeLists.txt
+++ b/core/vm/runtime/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_runtime
+filecoin_add_library(filecoin_runtime
     impl/env.cpp
     impl/runtime_impl.cpp
     impl/actor_state_handle_impl.cpp
diff --git a/core/vm/state/CMakeLists.txt b/core/vm/state/CMakeLists.txt
index c3f0a2b193..41aa5e1a2f 100644
--- a/core/vm/state/CMakeLists.txt
+++ b/core/vm/state/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_state_tree
+filecoin_add_library(filecoin_state_tree
     impl/state_tree_impl.cpp
     )
 target_link_libraries(filecoin_state_tree
diff --git a/deps/tinycbor.cmake b/deps/tinycbor.cmake
index 23d6b28eae..a36a5128d2 100644
--- a/deps/tinycbor.cmake
+++ b/deps/tinycbor.cmake
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(tinycbor
+filecoin_add_library(tinycbor
     tinycbor/src/cborerrorstrings.c
     tinycbor/src/cborencoder.c
     tinycbor/src/cborencoder_close_container_checked.c
diff --git a/test/testutil/primitives/ticket/CMakeLists.txt b/test/testutil/primitives/ticket/CMakeLists.txt
index e2fe963853..cb45240148 100644
--- a/test/testutil/primitives/ticket/CMakeLists.txt
+++ b/test/testutil/primitives/ticket/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_ticket_generator
+filecoin_add_library(filecoin_ticket_generator
     ticket_generator.cpp
     )
 target_link_libraries(filecoin_ticket_generator
@@ -11,7 +11,7 @@ target_link_libraries(filecoin_ticket_generator
     filecoin_tickets
     )
 
-add_library(filecoin_ticket_printer
+filecoin_add_library(filecoin_ticket_printer
     printer.cpp
     )
 target_link_libraries(filecoin_ticket_printer
diff --git a/test/testutil/storage/CMakeLists.txt b/test/testutil/storage/CMakeLists.txt
index 9bdde150c0..acdb1922db 100644
--- a/test/testutil/storage/CMakeLists.txt
+++ b/test/testutil/storage/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(filecoin_base_fs_test
+filecoin_add_library(filecoin_base_fs_test
     base_fs_test.hpp
     base_fs_test.cpp
     )
@@ -11,7 +11,7 @@ target_link_libraries(filecoin_base_fs_test
     filecoin_logger
     )
 
-add_library(filecoin_base_leveldb_test
+filecoin_add_library(filecoin_base_leveldb_test
     base_leveldb_test.hpp
     base_leveldb_test.cpp
     )
@@ -23,7 +23,7 @@ target_link_libraries(filecoin_base_leveldb_test
     filecoin_leveldb
     )
 
-add_library(filecoin_std_list_adapter INTERFACE)
+filecoin_add_library(filecoin_std_list_adapter INTERFACE)
 
 target_link_libraries(filecoin_std_list_adapter INTERFACE
     filecoin_outcome
diff --git a/test/testutil/vm/message/CMakeLists.txt b/test/testutil/vm/message/CMakeLists.txt
index abca8738d5..48373383d9 100644
--- a/test/testutil/vm/message/CMakeLists.txt
+++ b/test/testutil/vm/message/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_library(filecoin_message_test_util
+filecoin_add_library(filecoin_message_test_util
     message_test_util.cpp
     )
 target_link_libraries(filecoin_message_test_util

From 5813baa2cb9219b3e06eea1419d19c56a8b507fe Mon Sep 17 00:00:00 2001
From: Garrett Brown <garrett.brown@aclima.io>
Date: Sat, 7 Mar 2020 19:23:38 -0800
Subject: [PATCH 13/13] CMake: Add install step for headers

As a requirement, all headers are moved to a new include/ path.
---
 CMakeLists.txt                                |  2 +-
 cmake/install.cmake                           |  5 ++++
 core/adt/impl/array.cpp                       |  2 +-
 core/adt/impl/balance_table_hamt.cpp          |  4 +--
 core/adt/impl/multimap.cpp                    |  4 +--
 core/blockchain/impl/block_validator_impl.cpp |  2 +-
 .../impl/weight_calculator_impl.cpp           |  2 +-
 .../impl/gas_price_scored_message_storage.cpp |  4 +--
 .../message_pool/impl/message_pool_error.cpp  |  2 +-
 .../production/impl/block_producer_impl.cpp   | 14 +++++-----
 core/clock/chain_epoch_clock.cpp              |  2 +-
 core/clock/impl/chain_epoch_clock_impl.cpp    |  2 +-
 core/clock/impl/utc_clock_impl.cpp            |  2 +-
 core/clock/time.cpp                           |  2 +-
 core/codec/cbor/cbor_decode_stream.cpp        |  2 +-
 core/codec/cbor/cbor_encode_stream.cpp        |  2 +-
 core/codec/cbor/cbor_errors.cpp               |  2 +-
 core/codec/cbor/cbor_resolve.cpp              |  2 +-
 core/codec/rle/rle_plus_encoding_stream.cpp   |  2 +-
 core/codec/rle/rle_plus_errors.cpp            |  2 +-
 core/common/CMakeLists.txt                    |  3 ---
 core/common/blob.cpp                          |  2 +-
 core/common/buffer.cpp                        |  4 +--
 core/common/buffer_back_insert_iterator.cpp   |  2 +-
 core/common/hexutil.cpp                       |  2 +-
 core/common/logger.cpp                        |  2 +-
 core/crypto/blake2/blake2b.c                  |  2 +-
 core/crypto/blake2/blake2b160.cpp             |  4 +--
 core/crypto/blake2/blake2s.c                  |  4 +--
 core/crypto/bls/impl/bls_provider_impl.cpp    |  2 +-
 core/crypto/hasher/hasher.cpp                 |  4 +--
 core/crypto/murmur/murmur.cpp                 |  4 +--
 .../impl/chain_randomness_provider_impl.cpp   | 10 +++----
 .../impl/randomness_provider_impl.cpp         |  4 +--
 core/crypto/signature/signature.cpp           |  2 +-
 core/crypto/vrf/impl/vrf_provider_impl.cpp    |  6 ++---
 core/crypto/vrf/vrf_hash_encoder.cpp          |  6 ++---
 core/crypto/vrf/vrf_types.cpp                 |  2 +-
 core/fslock/fslock.cpp                        |  4 +--
 core/fslock/fslock_error.cpp                  |  2 +-
 core/power/impl/power_table_error.cpp         |  2 +-
 core/power/impl/power_table_hamt.cpp          |  6 ++---
 core/power/impl/power_table_impl.cpp          |  6 ++---
 core/primitives/address/CMakeLists.txt        |  2 +-
 core/primitives/address/address.cpp           |  6 ++---
 core/primitives/address/address_codec.cpp     | 10 +++----
 core/primitives/chain/chain.cpp               |  2 +-
 .../chain_epoch/chain_epoch_codec.cpp         |  2 +-
 core/primitives/cid/cid.cpp                   |  4 +--
 core/primitives/cid/comm_cid.cpp              |  4 +--
 core/primitives/cid/comm_cid_errors.cpp       |  2 +-
 core/primitives/cid/json_codec.cpp            |  4 +--
 core/primitives/piece/piece.cpp               |  4 +--
 core/primitives/piece/piece_error.cpp         |  2 +-
 core/primitives/ticket/epost_ticket.cpp       |  2 +-
 core/primitives/ticket/epost_ticket_codec.cpp |  2 +-
 core/primitives/ticket/ticket.cpp             |  4 +--
 core/primitives/ticket/ticket_codec.cpp       |  2 +-
 core/primitives/tipset/tipset.cpp             |  8 +++---
 core/primitives/tipset/tipset_key.cpp         |  4 +--
 core/proofs/proof_param_provider.cpp          |  8 +++---
 core/proofs/proof_param_provider_error.cpp    |  2 +-
 core/proofs/proofs.cpp                        |  6 ++---
 core/proofs/proofs_error.cpp                  |  2 +-
 core/storage/amt/amt.cpp                      |  4 +--
 core/storage/chain/datastore_key.cpp          |  2 +-
 .../chain/impl/chain_data_store_impl.cpp      |  4 +--
 core/storage/chain/impl/chain_store_impl.cpp  | 18 ++++++-------
 core/storage/config/config.cpp                |  2 +-
 core/storage/config/config_error.cpp          |  2 +-
 core/storage/filestore/filestore_error.cpp    |  2 +-
 .../impl/filesystem/filesystem_file.cpp       |  4 +--
 .../impl/filesystem/filesystem_filestore.cpp  |  6 ++---
 core/storage/hamt/hamt.cpp                    |  6 ++---
 core/storage/in_memory/in_memory_storage.cpp  |  4 +--
 core/storage/ipfs/impl/datastore_leveldb.cpp  |  4 +--
 .../storage/ipfs/impl/in_memory_datastore.cpp |  2 +-
 core/storage/ipfs/impl/ipfs_block_service.cpp |  2 +-
 .../ipfs/impl/ipfs_datastore_error.cpp        |  2 +-
 .../storage/ipfs/merkledag/impl/leaf_impl.cpp |  2 +-
 .../merkledag/impl/merkledag_service_impl.cpp |  4 +--
 core/storage/ipld/impl/ipld_link_impl.cpp     |  2 +-
 .../ipld/impl/ipld_node_decoder_pb.cpp        |  2 +-
 .../ipld/impl/ipld_node_encoder_pb.cpp        |  2 +-
 core/storage/ipld/impl/ipld_node_impl.cpp     |  4 +--
 .../impl/filesystem/filesystem_keystore.cpp   |  8 +++---
 .../impl/in_memory/in_memory_keystore.cpp     |  2 +-
 core/storage/keystore/keystore.cpp            |  4 +--
 core/storage/keystore/keystore_error.cpp      |  2 +-
 core/storage/leveldb/leveldb.cpp              |  8 +++---
 core/storage/leveldb/leveldb_batch.cpp        |  4 +--
 core/storage/leveldb/leveldb_cursor.cpp       |  4 +--
 core/storage/leveldb/leveldb_error.cpp        |  2 +-
 .../repository/impl/filesystem_repository.cpp | 12 ++++-----
 .../repository/impl/in_memory_repository.cpp  | 10 +++----
 core/storage/repository/impl/repository.cpp   |  2 +-
 .../repository/impl/repository_error.cpp      |  2 +-
 core/vm/actor/actor.cpp                       |  2 +-
 .../actor/builtin/account/account_actor.cpp   |  4 +--
 core/vm/actor/builtin/cron/cron_actor.cpp     |  4 +--
 core/vm/actor/builtin/init/init_actor.cpp     |  8 +++---
 core/vm/actor/builtin/miner/miner_actor.cpp   | 20 +++++++-------
 .../actor/builtin/multisig/multisig_actor.cpp |  8 +++---
 .../payment_channel/payment_channel_actor.cpp |  6 ++---
 core/vm/actor/builtin/reward/reward_actor.cpp |  8 +++---
 core/vm/actor/builtin/shared/shared.cpp       |  6 ++---
 .../vm/actor/builtin/storage_power/policy.cpp |  2 +-
 .../storage_power_actor_export.cpp            | 10 +++----
 .../storage_power_actor_state.cpp             | 10 +++----
 core/vm/actor/impl/invoker_impl.cpp           | 14 +++++-----
 core/vm/exit_code/impl/exit_code.cpp          |  4 +--
 core/vm/interpreter/impl/interpreter_impl.cpp | 18 ++++++-------
 core/vm/message/impl/message_signer_impl.cpp  |  4 +--
 core/vm/message/message.cpp                   |  2 +-
 core/vm/message/message_util.cpp              |  6 ++---
 .../runtime/impl/actor_state_handle_impl.cpp  |  2 +-
 core/vm/runtime/impl/env.cpp                  | 12 ++++-----
 core/vm/runtime/impl/runtime_error.cpp        |  2 +-
 core/vm/runtime/impl/runtime_impl.cpp         | 12 ++++-----
 core/vm/state/impl/state_tree_impl.cpp        |  8 +++---
 {core => include/filecoin}/adt/array.hpp      | 10 +++----
 .../filecoin}/adt/balance_table_hamt.hpp      | 12 ++++-----
 {core => include/filecoin}/adt/multimap.hpp   |  8 +++---
 .../filecoin}/blockchain/block_validator.hpp  |  2 +-
 .../filecoin}/blockchain/chain_manager.hpp    |  0
 .../blockchain/chain_tips_manager.hpp         |  2 +-
 .../blockchain/impl/block_validator_impl.hpp  |  2 +-
 .../impl/weight_calculator_impl.hpp           |  2 +-
 .../impl/gas_price_scored_message_storage.hpp |  2 +-
 .../message_pool/message_pool_error.hpp       |  2 +-
 .../message_pool/message_storage.hpp          |  6 ++---
 .../blockchain/production/block_producer.hpp  | 12 ++++-----
 .../production/impl/block_producer_impl.hpp   | 20 +++++++-------
 .../blockchain/weight_calculator.hpp          |  4 +--
 .../filecoin}/clock/chain_epoch_clock.hpp     |  4 +--
 .../clock/impl/chain_epoch_clock_impl.hpp     |  2 +-
 .../filecoin}/clock/impl/utc_clock_impl.hpp   |  2 +-
 {core => include/filecoin}/clock/time.hpp     |  2 +-
 .../filecoin}/clock/utc_clock.hpp             |  2 +-
 .../filecoin}/codec/cbor/cbor.hpp             |  6 ++---
 .../filecoin}/codec/cbor/cbor_common.hpp      |  6 ++---
 .../codec/cbor/cbor_decode_stream.hpp         |  2 +-
 .../codec/cbor/cbor_encode_stream.hpp         |  4 +--
 .../filecoin}/codec/cbor/cbor_errors.hpp      |  2 +-
 .../filecoin}/codec/cbor/cbor_resolve.hpp     |  2 +-
 .../codec/cbor/streams_annotation.hpp         |  0
 .../filecoin}/codec/rle/rle_plus.hpp          |  8 +++---
 .../filecoin}/codec/rle/rle_plus_config.hpp   |  0
 .../codec/rle/rle_plus_decoding_stream.hpp    |  4 +--
 .../codec/rle/rle_plus_encoding_stream.hpp    |  2 +-
 .../filecoin}/codec/rle/rle_plus_errors.hpp   |  2 +-
 {core => include/filecoin}/common/blob.hpp    |  2 +-
 {core => include/filecoin}/common/buffer.hpp  |  4 +--
 {core => include/filecoin}/common/enum.hpp    |  0
 {core => include/filecoin}/common/hexutil.hpp |  2 +-
 .../filecoin}/common/le_encoder.hpp           |  2 +-
 {core => include/filecoin}/common/logger.hpp  |  0
 {core => include/filecoin}/common/outcome.hpp |  0
 .../filecoin}/common/outcome_throw.hpp        |  0
 {core => include/filecoin}/common/visitor.hpp |  0
 {core => include/filecoin}/common/which.hpp   |  0
 .../filecoin}/crypto/blake2/blake2b.h         |  0
 .../filecoin}/crypto/blake2/blake2b160.hpp    |  4 +--
 .../filecoin}/crypto/blake2/blake2s.h         |  0
 .../filecoin}/crypto/bls/bls_provider.hpp     |  2 +-
 .../filecoin}/crypto/bls/bls_types.hpp        |  4 +--
 .../crypto/bls/impl/bls_provider_impl.hpp     |  2 +-
 .../filecoin}/crypto/bls/libbls_signatures.h  |  0
 .../filecoin}/crypto/hasher/hasher.hpp        |  0
 .../filecoin}/crypto/murmur/murmur.hpp        |  0
 .../randomness/chain_randomness_provider.hpp  |  4 +--
 .../impl/chain_randomness_provider_impl.hpp   |  4 +--
 .../impl/randomness_provider_impl.hpp         |  2 +-
 .../crypto/randomness/randomness_provider.hpp |  4 +--
 .../crypto/randomness/randomness_types.hpp    |  4 +--
 .../crypto/secp256k1/secp256k1_provider.hpp   |  0
 .../filecoin}/crypto/signature/signature.hpp  | 10 +++----
 .../crypto/vrf/impl/vrf_provider_impl.hpp     |  4 +--
 .../filecoin}/crypto/vrf/vrf_hash_encoder.hpp |  2 +-
 .../filecoin}/crypto/vrf/vrf_provider.hpp     |  2 +-
 .../filecoin}/crypto/vrf/vrf_types.hpp        | 10 +++----
 {core => include/filecoin}/fslock/fslock.hpp  |  2 +-
 .../filecoin}/fslock/fslock_error.hpp         |  2 +-
 .../filecoin}/power/impl/power_table_hamt.hpp |  4 +--
 .../filecoin}/power/impl/power_table_impl.hpp |  2 +-
 .../filecoin}/power/power_table.hpp           |  6 ++---
 .../filecoin}/power/power_table_error.hpp     |  2 +-
 .../filecoin}/primitives/address/address.hpp  |  6 ++---
 .../primitives/address/address_codec.hpp      |  6 ++---
 .../filecoin}/primitives/big_int.hpp          |  2 +-
 .../filecoin}/primitives/block/block.hpp      | 24 ++++++++---------
 .../primitives/boost_multiprecision.hpp       |  0
 .../filecoin}/primitives/chain/chain.hpp      |  8 +++---
 .../primitives/chain_epoch/chain_epoch.hpp    |  0
 .../chain_epoch/chain_epoch_codec.hpp         |  2 +-
 .../filecoin}/primitives/cid/cid.hpp          |  2 +-
 .../filecoin}/primitives/cid/cid_of_cbor.hpp  |  4 +--
 .../filecoin}/primitives/cid/comm_cid.hpp     |  4 +--
 .../primitives/cid/comm_cid_errors.hpp        |  2 +-
 .../filecoin}/primitives/cid/json_codec.hpp   |  6 ++---
 .../filecoin}/primitives/piece/piece.hpp      |  2 +-
 .../primitives/piece/piece_error.hpp          |  2 +-
 .../primitives/rle_bitset/rle_bitset.hpp      |  6 ++---
 .../filecoin}/primitives/sector/sector.hpp    |  4 +--
 .../primitives/ticket/epost_ticket.hpp        |  6 ++---
 .../primitives/ticket/epost_ticket_codec.hpp  |  8 +++---
 .../filecoin}/primitives/ticket/ticket.hpp    | 10 +++----
 .../primitives/ticket/ticket_codec.hpp        |  8 +++---
 .../filecoin}/primitives/tipset/tipset.hpp    | 12 ++++-----
 .../primitives/tipset/tipset_key.hpp          |  4 +--
 .../filecoin}/primitives/types.hpp            |  6 ++---
 .../filecoin}/proofs/proof_param_provider.hpp |  4 +--
 .../proofs/proof_param_provider_error.hpp     |  2 +-
 {core => include/filecoin}/proofs/proofs.hpp  | 14 +++++-----
 .../filecoin}/proofs/proofs_error.hpp         |  2 +-
 .../filecoin}/storage/amt/amt.hpp             | 14 +++++-----
 .../filecoin}/storage/buffer_map.hpp          |  8 +++---
 .../storage/chain/chain_data_store.hpp        |  2 +-
 .../filecoin}/storage/chain/chain_store.hpp   |  4 +--
 .../filecoin}/storage/chain/datastore_key.hpp |  4 +--
 .../chain/impl/chain_data_store_impl.hpp      |  4 +--
 .../storage/chain/impl/chain_store_impl.hpp   | 20 +++++++-------
 .../filecoin}/storage/config/config.hpp       |  4 +--
 .../filecoin}/storage/config/config_error.hpp |  2 +-
 .../storage/config/config_validator.hpp       |  4 +--
 .../storage/face/generic_iterator.hpp         |  0
 .../filecoin}/storage/face/generic_list.hpp   |  2 +-
 .../filecoin}/storage/face/generic_map.hpp    |  6 ++---
 .../filecoin}/storage/face/iterable_map.hpp   |  2 +-
 .../filecoin}/storage/face/map_cursor.hpp     |  0
 .../filecoin}/storage/face/persistent_map.hpp |  4 +--
 .../filecoin}/storage/face/readable_map.hpp   |  4 +--
 .../filecoin}/storage/face/write_batch.hpp    |  2 +-
 .../filecoin}/storage/face/writeable_map.hpp  |  2 +-
 .../filecoin}/storage/filestore/file.hpp      |  4 +--
 .../filecoin}/storage/filestore/filestore.hpp |  6 ++---
 .../storage/filestore/filestore_error.hpp     |  2 +-
 .../impl/filesystem/filesystem_file.hpp       |  2 +-
 .../impl/filesystem/filesystem_filestore.hpp  |  2 +-
 .../filecoin}/storage/filestore/path.hpp      |  0
 .../filecoin}/storage/hamt/hamt.hpp           | 12 ++++-----
 .../storage/in_memory/in_memory_batch.hpp     |  4 +--
 .../storage/in_memory/in_memory_storage.hpp   |  6 ++---
 .../filecoin}/storage/ipfs/datastore.hpp      | 12 ++++-----
 .../storage/ipfs/impl/datastore_leveldb.hpp   |  6 ++---
 .../storage/ipfs/impl/in_memory_datastore.hpp |  2 +-
 .../storage/ipfs/impl/ipfs_block_service.hpp  |  2 +-
 .../storage/ipfs/ipfs_datastore_error.hpp     |  2 +-
 .../storage/ipfs/merkledag/impl/leaf_impl.hpp |  2 +-
 .../merkledag/impl/merkledag_service_impl.hpp |  8 +++---
 .../filecoin}/storage/ipfs/merkledag/leaf.hpp |  4 +--
 .../ipfs/merkledag/merkledag_service.hpp      |  6 ++---
 .../storage/ipld/impl/ipld_link_impl.hpp      |  2 +-
 .../ipld/impl/ipld_node_decoder_pb.hpp        |  4 +--
 .../ipld/impl/ipld_node_encoder_pb.hpp        |  8 +++---
 .../storage/ipld/impl/ipld_node_impl.hpp      |  8 +++---
 .../filecoin}/storage/ipld/ipld_block.hpp     |  4 +--
 .../storage/ipld/ipld_block_common.hpp        |  8 +++---
 .../filecoin}/storage/ipld/ipld_link.hpp      |  2 +-
 .../filecoin}/storage/ipld/ipld_node.hpp      |  8 +++---
 .../impl/filesystem/filesystem_keystore.hpp   |  6 ++---
 .../impl/in_memory/in_memory_keystore.hpp     |  2 +-
 .../filecoin}/storage/keystore/keystore.hpp   | 14 +++++-----
 .../storage/keystore/keystore_error.hpp       |  2 +-
 .../filecoin}/storage/leveldb/leveldb.hpp     |  4 +--
 .../storage/leveldb/leveldb_batch.hpp         |  2 +-
 .../storage/leveldb/leveldb_cursor.hpp        |  2 +-
 .../storage/leveldb/leveldb_error.hpp         |  2 +-
 .../storage/leveldb/leveldb_util.hpp          |  8 +++---
 .../repository/impl/filesystem_repository.hpp |  8 +++---
 .../repository/impl/in_memory_repository.hpp  |  2 +-
 .../storage/repository/repository.hpp         |  8 +++---
 .../storage/repository/repository_error.hpp   |  2 +-
 {core => include/filecoin}/vm/actor/actor.hpp | 10 +++----
 .../filecoin}/vm/actor/actor_encoding.hpp     | 10 +++----
 .../filecoin}/vm/actor/actor_method.hpp       | 12 ++++-----
 .../actor/builtin/account/account_actor.hpp   |  8 +++---
 .../vm/actor/builtin/cron/cron_actor.hpp      |  2 +-
 .../vm/actor/builtin/init/init_actor.hpp      |  6 ++---
 .../vm/actor/builtin/market/actor.hpp         |  6 ++---
 .../vm/actor/builtin/miner/miner_actor.hpp    | 10 +++----
 .../vm/actor/builtin/miner/policy.hpp         |  2 +-
 .../vm/actor/builtin/miner/types.hpp          | 10 +++----
 .../actor/builtin/multisig/multisig_actor.hpp | 18 ++++++-------
 .../payment_channel/payment_channel_actor.hpp | 14 +++++-----
 .../payment_channel_actor_state.hpp           | 14 +++++-----
 .../vm/actor/builtin/reward/reward_actor.hpp  | 18 ++++++-------
 .../vm/actor/builtin/shared/shared.hpp        |  6 ++---
 .../vm/actor/builtin/storage_power/policy.hpp |  2 +-
 .../storage_power_actor_export.hpp            | 12 ++++-----
 .../storage_power_actor_state.hpp             | 18 ++++++-------
 .../filecoin}/vm/actor/impl/invoker_impl.hpp  |  4 +--
 .../filecoin}/vm/actor/invoker.hpp            |  2 +-
 .../filecoin}/vm/exit_code/exit_code.hpp      |  2 +-
 .../filecoin}/vm/indices/indices.hpp          |  4 +--
 .../vm/interpreter/impl/interpreter_impl.hpp  |  4 +--
 .../filecoin}/vm/interpreter/interpreter.hpp  |  6 ++---
 .../vm/message/impl/message_signer_impl.hpp   |  6 ++---
 .../filecoin}/vm/message/message.hpp          | 18 ++++++-------
 .../filecoin}/vm/message/message_signer.hpp   |  6 ++---
 .../filecoin}/vm/message/message_util.hpp     |  4 +--
 .../vm/runtime/actor_state_handle.hpp         |  2 +-
 {core => include/filecoin}/vm/runtime/env.hpp |  8 +++---
 .../filecoin}/vm/runtime/gas_cost.hpp         |  2 +-
 .../runtime/impl/actor_state_handle_impl.hpp  |  2 +-
 .../vm/runtime/impl/runtime_impl.hpp          | 14 +++++-----
 .../filecoin}/vm/runtime/runtime.hpp          | 26 +++++++++----------
 .../filecoin}/vm/runtime/runtime_error.hpp    |  2 +-
 .../filecoin}/vm/runtime/runtime_types.hpp    | 10 +++----
 .../vm/state/impl/state_tree_impl.hpp         |  6 ++---
 .../filecoin}/vm/state/state_tree.hpp         |  4 +--
 test/core/adt/array_test.cpp                  |  6 ++---
 test/core/adt/balance_table_hamt_test.cpp     |  4 +--
 test/core/adt/multimap_test.cpp               |  8 +++---
 .../gas_price_scored_message_storage_test.cpp |  4 +--
 .../production/block_producer_test.cpp        |  2 +-
 .../production/block_producer_test.hpp        | 16 ++++++------
 test/core/clock/chain_epoch_clock_test.cpp    |  2 +-
 test/core/clock/time_test.cpp                 |  2 +-
 test/core/codec/cbor/cbor_test.cpp            |  6 ++---
 .../codec/rleplus/rle_plus_codec_test.cpp     |  2 +-
 .../codec/rleplus/rle_plus_codec_tester.hpp   |  2 +-
 test/core/common/blob_test.cpp                |  2 +-
 test/core/common/hexutil_test.cpp             |  2 +-
 test/core/common/le_encoder_test.cpp          |  2 +-
 test/core/crypto/blake2_test.cpp              |  4 +--
 test/core/crypto/bls_provider_test.cpp        |  2 +-
 test/core/crypto/murmur_test.cpp              |  4 +--
 .../randomness/randomness_provider_test.cpp   |  2 +-
 test/core/crypto/vrf/vrf_encoder_test.cpp     |  2 +-
 test/core/crypto/vrf/vrf_provider_test.cpp    |  4 +--
 test/core/fslock/fslock_test.cpp              |  6 ++---
 test/core/power/power_table_hamt_test.cpp     |  6 ++---
 test/core/power/power_table_test.cpp          |  6 ++---
 .../primitives/address/address_codec_test.cpp |  4 +--
 test/core/primitives/address/address_test.cpp |  2 +-
 .../address/address_verifier_test.cpp         |  8 +++---
 test/core/primitives/big_int_test.cpp         |  2 +-
 test/core/primitives/block/block_test.cpp     |  4 +--
 .../chain_epoch/chain_epoch_codec_test.cpp    |  2 +-
 test/core/primitives/cid/cid_json_test.cpp    |  4 +--
 .../primitives/rle_bitset/rle_bitset_test.cpp |  2 +-
 .../ticket/epost_proof_codec_test.cpp         |  2 +-
 .../ticket/epost_ticket_codec_test.cpp        |  2 +-
 .../primitives/ticket/epost_ticket_test.cpp   |  2 +-
 .../primitives/ticket/ticket_codec_test.cpp   |  2 +-
 test/core/primitives/ticket/ticket_test.cpp   |  4 +--
 .../primitives/tipset/tipset_key_test.cpp     |  4 +--
 test/core/primitives/tipset/tipset_test.cpp   |  6 ++---
 test/core/proofs/proofs_test.cpp              |  6 ++---
 test/core/storage/amt/amt_test.cpp            |  4 +--
 .../chain_data_store_test.cpp                 |  4 +--
 .../chain/chain_store/chain_store_test.cpp    | 16 ++++++------
 .../datastore_key/datastore_key_cbor_test.cpp |  4 +--
 .../datastore_key_compare_test.cpp            |  2 +-
 .../datastore_key_create_test.cpp             |  2 +-
 test/core/storage/config/config_test.cpp      |  2 +-
 .../filesystem/filesystem_file_test.cpp       |  4 +--
 .../filesystem/filesystem_filestore_test.cpp  |  4 +--
 test/core/storage/hamt/hamt_test.cpp          |  8 +++---
 .../ipfs/datastore_integration_test.cpp       |  2 +-
 .../ipfs/in_memory_ipfs_datastore_test.cpp    |  2 +-
 .../storage/ipfs/ipfs_block_service_test.cpp  |  8 +++---
 .../ipfs/merkledag/ipfs_merkledag_dataset.hpp |  2 +-
 .../merkledag/ipfs_merkledag_service_test.cpp |  8 +++---
 .../keystore/filesystem_keystore_test.cpp     | 10 +++----
 .../keystore/in_memory_keystore_test.cpp      | 10 +++----
 test/core/storage/leveldb/leveldb_fs_test.cpp |  4 +--
 .../leveldb/leveldb_integration_test.cpp      |  4 +--
 .../repository/filesystem_repository_test.cpp |  8 +++---
 test/core/vm/actor/actor_test.cpp             |  2 +-
 .../builtin/account/account_actor_test.cpp    |  2 +-
 .../vm/actor/builtin/cron/cron_actor_test.cpp |  6 ++---
 .../vm/actor/builtin/init/init_actor_test.cpp |  8 +++---
 .../actor/builtin/miner/miner_actor_test.cpp  |  2 +-
 .../multisig_actor/multisig_actor_test.cpp    |  6 ++---
 .../payment_channel_actor_test.cpp            |  8 +++---
 .../storage_power_actor_state_test.cpp        |  6 ++---
 .../storage_power_actor_test.cpp              | 12 ++++-----
 test/core/vm/actor/invoker_test.cpp           |  4 +--
 test/core/vm/exit_code/exit_code_test.cpp     |  2 +-
 test/core/vm/message/message_test.cpp         | 10 +++----
 test/core/vm/runtime/runtime_test.cpp         | 12 ++++-----
 test/core/vm/state/state_tree_test.cpp        |  4 +--
 test/testutil/cbor.hpp                        |  2 +-
 test/testutil/init_actor.hpp                  |  6 ++---
 test/testutil/literals.hpp                    |  4 +--
 .../message_pool/message_storage_mock.hpp     |  2 +-
 .../blockchain/weight_calculator_mock.hpp     |  2 +-
 test/testutil/mocks/clock/utc_clock_mock.hpp  |  2 +-
 .../mocks/crypto/bls/bls_provider_mock.hpp    |  2 +-
 .../randomness/randomness_provider_mock.hpp   |  2 +-
 .../storage/chain/chain_data_store_mock.hpp   |  2 +-
 .../storage/ipfs/ipfs_datastore_mock.hpp      |  2 +-
 test/testutil/mocks/vm/actor/invoker_mock.hpp |  2 +-
 .../mocks/vm/indices/indices_mock.hpp         |  2 +-
 .../mocks/vm/interpreter/interpreter_mock.hpp |  2 +-
 .../mocks/vm/runtime/runtime_mock.hpp         |  2 +-
 .../mocks/vm/state/state_tree_mock.hpp        |  2 +-
 test/testutil/outcome.hpp                     |  4 +--
 test/testutil/primitives/ticket/printer.hpp   |  6 ++---
 .../primitives/ticket/ticket_generator.hpp    |  4 +--
 test/testutil/storage/base_fs_test.hpp        |  2 +-
 test/testutil/storage/base_leveldb_test.hpp   |  2 +-
 test/testutil/storage/std_list_adapter.hpp    |  4 +--
 .../testutil/vm/message/message_test_util.cpp |  4 +--
 .../testutil/vm/message/message_test_util.hpp |  4 +--
 407 files changed, 957 insertions(+), 955 deletions(-)
 rename {core => include/filecoin}/adt/array.hpp (89%)
 rename {core => include/filecoin}/adt/balance_table_hamt.hpp (89%)
 rename {core => include/filecoin}/adt/multimap.hpp (91%)
 rename {core => include/filecoin}/blockchain/block_validator.hpp (93%)
 rename {core => include/filecoin}/blockchain/chain_manager.hpp (100%)
 rename {core => include/filecoin}/blockchain/chain_tips_manager.hpp (96%)
 rename {core => include/filecoin}/blockchain/impl/block_validator_impl.hpp (92%)
 rename {core => include/filecoin}/blockchain/impl/weight_calculator_impl.hpp (92%)
 rename {core => include/filecoin}/blockchain/message_pool/impl/gas_price_scored_message_storage.hpp (96%)
 rename {core => include/filecoin}/blockchain/message_pool/message_pool_error.hpp (93%)
 rename {core => include/filecoin}/blockchain/message_pool/message_storage.hpp (90%)
 rename {core => include/filecoin}/blockchain/production/block_producer.hpp (82%)
 rename {core => include/filecoin}/blockchain/production/impl/block_producer_impl.hpp (85%)
 rename {core => include/filecoin}/blockchain/weight_calculator.hpp (88%)
 rename {core => include/filecoin}/clock/chain_epoch_clock.hpp (89%)
 rename {core => include/filecoin}/clock/impl/chain_epoch_clock_impl.hpp (92%)
 rename {core => include/filecoin}/clock/impl/utc_clock_impl.hpp (91%)
 rename {core => include/filecoin}/clock/time.hpp (95%)
 rename {core => include/filecoin}/clock/utc_clock.hpp (92%)
 rename {core => include/filecoin}/codec/cbor/cbor.hpp (88%)
 rename {core => include/filecoin}/codec/cbor/cbor_common.hpp (77%)
 rename {core => include/filecoin}/codec/cbor/cbor_decode_stream.hpp (98%)
 rename {core => include/filecoin}/codec/cbor/cbor_encode_stream.hpp (97%)
 rename {core => include/filecoin}/codec/cbor/cbor_errors.hpp (94%)
 rename {core => include/filecoin}/codec/cbor/cbor_resolve.hpp (93%)
 rename {core => include/filecoin}/codec/cbor/streams_annotation.hpp (100%)
 rename {core => include/filecoin}/codec/rle/rle_plus.hpp (86%)
 rename {core => include/filecoin}/codec/rle/rle_plus_config.hpp (100%)
 rename {core => include/filecoin}/codec/rle/rle_plus_decoding_stream.hpp (98%)
 rename {core => include/filecoin}/codec/rle/rle_plus_encoding_stream.hpp (98%)
 rename {core => include/filecoin}/codec/rle/rle_plus_errors.hpp (95%)
 rename {core => include/filecoin}/common/blob.hpp (99%)
 rename {core => include/filecoin}/common/buffer.hpp (98%)
 rename {core => include/filecoin}/common/enum.hpp (100%)
 rename {core => include/filecoin}/common/hexutil.hpp (97%)
 rename {core => include/filecoin}/common/le_encoder.hpp (96%)
 rename {core => include/filecoin}/common/logger.hpp (100%)
 rename {core => include/filecoin}/common/outcome.hpp (100%)
 rename {core => include/filecoin}/common/outcome_throw.hpp (100%)
 rename {core => include/filecoin}/common/visitor.hpp (100%)
 rename {core => include/filecoin}/common/which.hpp (100%)
 rename {core => include/filecoin}/crypto/blake2/blake2b.h (100%)
 rename {core => include/filecoin}/crypto/blake2/blake2b160.hpp (93%)
 rename {core => include/filecoin}/crypto/blake2/blake2s.h (100%)
 rename {core => include/filecoin}/crypto/bls/bls_provider.hpp (97%)
 rename {core => include/filecoin}/crypto/bls/bls_types.hpp (90%)
 rename {core => include/filecoin}/crypto/bls/impl/bls_provider_impl.hpp (96%)
 rename {core => include/filecoin}/crypto/bls/libbls_signatures.h (100%)
 rename {core => include/filecoin}/crypto/hasher/hasher.hpp (100%)
 rename {core => include/filecoin}/crypto/murmur/murmur.hpp (100%)
 rename {core => include/filecoin}/crypto/randomness/chain_randomness_provider.hpp (88%)
 rename {core => include/filecoin}/crypto/randomness/impl/chain_randomness_provider_impl.hpp (88%)
 rename {core => include/filecoin}/crypto/randomness/impl/randomness_provider_impl.hpp (95%)
 rename {core => include/filecoin}/crypto/randomness/randomness_provider.hpp (92%)
 rename {core => include/filecoin}/crypto/randomness/randomness_types.hpp (90%)
 rename {core => include/filecoin}/crypto/secp256k1/secp256k1_provider.hpp (100%)
 rename {core => include/filecoin}/crypto/signature/signature.hpp (91%)
 rename {core => include/filecoin}/crypto/vrf/impl/vrf_provider_impl.hpp (90%)
 rename {core => include/filecoin}/crypto/vrf/vrf_hash_encoder.hpp (94%)
 rename {core => include/filecoin}/crypto/vrf/vrf_provider.hpp (97%)
 rename {core => include/filecoin}/crypto/vrf/vrf_types.hpp (86%)
 rename {core => include/filecoin}/fslock/fslock.hpp (94%)
 rename {core => include/filecoin}/fslock/fslock_error.hpp (92%)
 rename {core => include/filecoin}/power/impl/power_table_hamt.hpp (95%)
 rename {core => include/filecoin}/power/impl/power_table_impl.hpp (96%)
 rename {core => include/filecoin}/power/power_table.hpp (93%)
 rename {core => include/filecoin}/power/power_table_error.hpp (92%)
 rename {core => include/filecoin}/primitives/address/address.hpp (95%)
 rename {core => include/filecoin}/primitives/address/address_codec.hpp (93%)
 rename {core => include/filecoin}/primitives/big_int.hpp (94%)
 rename {core => include/filecoin}/primitives/block/block.hpp (81%)
 rename {core => include/filecoin}/primitives/boost_multiprecision.hpp (100%)
 rename {core => include/filecoin}/primitives/chain/chain.hpp (90%)
 rename {core => include/filecoin}/primitives/chain_epoch/chain_epoch.hpp (100%)
 rename {core => include/filecoin}/primitives/chain_epoch/chain_epoch_codec.hpp (88%)
 rename {core => include/filecoin}/primitives/cid/cid.hpp (97%)
 rename {core => include/filecoin}/primitives/cid/cid_of_cbor.hpp (89%)
 rename {core => include/filecoin}/primitives/cid/comm_cid.hpp (97%)
 rename {core => include/filecoin}/primitives/cid/comm_cid_errors.hpp (93%)
 rename {core => include/filecoin}/primitives/cid/json_codec.hpp (87%)
 rename {core => include/filecoin}/primitives/piece/piece.hpp (95%)
 rename {core => include/filecoin}/primitives/piece/piece_error.hpp (93%)
 rename {core => include/filecoin}/primitives/rle_bitset/rle_bitset.hpp (84%)
 rename {core => include/filecoin}/primitives/sector/sector.hpp (97%)
 rename {core => include/filecoin}/primitives/ticket/epost_ticket.hpp (92%)
 rename {core => include/filecoin}/primitives/ticket/epost_ticket_codec.hpp (91%)
 rename {core => include/filecoin}/primitives/ticket/ticket.hpp (85%)
 rename {core => include/filecoin}/primitives/ticket/ticket_codec.hpp (88%)
 rename {core => include/filecoin}/primitives/tipset/tipset.hpp (89%)
 rename {core => include/filecoin}/primitives/tipset/tipset_key.hpp (94%)
 rename {core => include/filecoin}/primitives/types.hpp (82%)
 rename {core => include/filecoin}/proofs/proof_param_provider.hpp (92%)
 rename {core => include/filecoin}/proofs/proof_param_provider_error.hpp (94%)
 rename {core => include/filecoin}/proofs/proofs.hpp (94%)
 rename {core => include/filecoin}/proofs/proofs_error.hpp (93%)
 rename {core => include/filecoin}/storage/amt/amt.hpp (94%)
 rename {core => include/filecoin}/storage/buffer_map.hpp (79%)
 rename {core => include/filecoin}/storage/chain/chain_data_store.hpp (95%)
 rename {core => include/filecoin}/storage/chain/chain_store.hpp (94%)
 rename {core => include/filecoin}/storage/chain/datastore_key.hpp (93%)
 rename {core => include/filecoin}/storage/chain/impl/chain_data_store_impl.hpp (89%)
 rename {core => include/filecoin}/storage/chain/impl/chain_store_impl.hpp (85%)
 rename {core => include/filecoin}/storage/config/config.hpp (95%)
 rename {core => include/filecoin}/storage/config/config_error.hpp (93%)
 rename {core => include/filecoin}/storage/config/config_validator.hpp (87%)
 rename {core => include/filecoin}/storage/face/generic_iterator.hpp (100%)
 rename {core => include/filecoin}/storage/face/generic_list.hpp (98%)
 rename {core => include/filecoin}/storage/face/generic_map.hpp (80%)
 rename {core => include/filecoin}/storage/face/iterable_map.hpp (93%)
 rename {core => include/filecoin}/storage/face/map_cursor.hpp (100%)
 rename {core => include/filecoin}/storage/face/persistent_map.hpp (88%)
 rename {core => include/filecoin}/storage/face/readable_map.hpp (90%)
 rename {core => include/filecoin}/storage/face/write_batch.hpp (93%)
 rename {core => include/filecoin}/storage/face/writeable_map.hpp (96%)
 rename {core => include/filecoin}/storage/filestore/file.hpp (95%)
 rename {core => include/filecoin}/storage/filestore/filestore.hpp (92%)
 rename {core => include/filecoin}/storage/filestore/filestore_error.hpp (94%)
 rename {core => include/filecoin}/storage/filestore/impl/filesystem/filesystem_file.hpp (96%)
 rename {core => include/filecoin}/storage/filestore/impl/filesystem/filesystem_filestore.hpp (95%)
 rename {core => include/filecoin}/storage/filestore/path.hpp (100%)
 rename {core => include/filecoin}/storage/hamt/hamt.hpp (95%)
 rename {core => include/filecoin}/storage/in_memory/in_memory_batch.hpp (93%)
 rename {core => include/filecoin}/storage/in_memory/in_memory_storage.hpp (91%)
 rename {core => include/filecoin}/storage/ipfs/datastore.hpp (88%)
 rename {core => include/filecoin}/storage/ipfs/impl/datastore_leveldb.hpp (91%)
 rename {core => include/filecoin}/storage/ipfs/impl/in_memory_datastore.hpp (95%)
 rename {core => include/filecoin}/storage/ipfs/impl/ipfs_block_service.hpp (95%)
 rename {core => include/filecoin}/storage/ipfs/ipfs_datastore_error.hpp (93%)
 rename {core => include/filecoin}/storage/ipfs/merkledag/impl/leaf_impl.hpp (95%)
 rename {core => include/filecoin}/storage/ipfs/merkledag/impl/merkledag_service_impl.hpp (90%)
 rename {core => include/filecoin}/storage/ipfs/merkledag/leaf.hpp (94%)
 rename {core => include/filecoin}/storage/ipfs/merkledag/merkledag_service.hpp (94%)
 rename {core => include/filecoin}/storage/ipld/impl/ipld_link_impl.hpp (95%)
 rename {core => include/filecoin}/storage/ipld/impl/ipld_node_decoder_pb.hpp (95%)
 rename {core => include/filecoin}/storage/ipld/impl/ipld_node_encoder_pb.hpp (93%)
 rename {core => include/filecoin}/storage/ipld/impl/ipld_node_impl.hpp (87%)
 rename {core => include/filecoin}/storage/ipld/ipld_block.hpp (90%)
 rename {core => include/filecoin}/storage/ipld/ipld_block_common.hpp (90%)
 rename {core => include/filecoin}/storage/ipld/ipld_link.hpp (95%)
 rename {core => include/filecoin}/storage/ipld/ipld_node.hpp (92%)
 rename {core => include/filecoin}/storage/keystore/impl/filesystem/filesystem_keystore.hpp (92%)
 rename {core => include/filecoin}/storage/keystore/impl/in_memory/in_memory_keystore.hpp (96%)
 rename {core => include/filecoin}/storage/keystore/keystore.hpp (90%)
 rename {core => include/filecoin}/storage/keystore/keystore_error.hpp (94%)
 rename {core => include/filecoin}/storage/leveldb/leveldb.hpp (96%)
 rename {core => include/filecoin}/storage/leveldb/leveldb_batch.hpp (94%)
 rename {core => include/filecoin}/storage/leveldb/leveldb_cursor.hpp (95%)
 rename {core => include/filecoin}/storage/leveldb/leveldb_error.hpp (94%)
 rename {core => include/filecoin}/storage/leveldb/leveldb_util.hpp (91%)
 rename {core => include/filecoin}/storage/repository/impl/filesystem_repository.hpp (93%)
 rename {core => include/filecoin}/storage/repository/impl/in_memory_repository.hpp (94%)
 rename {core => include/filecoin}/storage/repository/repository.hpp (91%)
 rename {core => include/filecoin}/storage/repository/repository_error.hpp (93%)
 rename {core => include/filecoin}/vm/actor/actor.hpp (94%)
 rename {core => include/filecoin}/vm/actor/actor_encoding.hpp (88%)
 rename {core => include/filecoin}/vm/actor/actor_method.hpp (87%)
 rename {core => include/filecoin}/vm/actor/builtin/account/account_actor.hpp (86%)
 rename {core => include/filecoin}/vm/actor/builtin/cron/cron_actor.hpp (94%)
 rename {core => include/filecoin}/vm/actor/builtin/init/init_actor.hpp (90%)
 rename {core => include/filecoin}/vm/actor/builtin/market/actor.hpp (89%)
 rename {core => include/filecoin}/vm/actor/builtin/miner/miner_actor.hpp (91%)
 rename {core => include/filecoin}/vm/actor/builtin/miner/policy.hpp (97%)
 rename {core => include/filecoin}/vm/actor/builtin/miner/types.hpp (94%)
 rename {core => include/filecoin}/vm/actor/builtin/multisig/multisig_actor.hpp (92%)
 rename {core => include/filecoin}/vm/actor/builtin/payment_channel/payment_channel_actor.hpp (74%)
 rename {core => include/filecoin}/vm/actor/builtin/payment_channel/payment_channel_actor_state.hpp (86%)
 rename {core => include/filecoin}/vm/actor/builtin/reward/reward_actor.hpp (85%)
 rename {core => include/filecoin}/vm/actor/builtin/shared/shared.hpp (80%)
 rename {core => include/filecoin}/vm/actor/builtin/storage_power/policy.hpp (97%)
 rename {core => include/filecoin}/vm/actor/builtin/storage_power/storage_power_actor_export.hpp (93%)
 rename {core => include/filecoin}/vm/actor/builtin/storage_power/storage_power_actor_state.hpp (95%)
 rename {core => include/filecoin}/vm/actor/impl/invoker_impl.hpp (89%)
 rename {core => include/filecoin}/vm/actor/invoker.hpp (93%)
 rename {core => include/filecoin}/vm/exit_code/exit_code.hpp (99%)
 rename {core => include/filecoin}/vm/indices/indices.hpp (92%)
 rename {core => include/filecoin}/vm/interpreter/impl/interpreter_impl.hpp (90%)
 rename {core => include/filecoin}/vm/interpreter/interpreter.hpp (87%)
 rename {core => include/filecoin}/vm/message/impl/message_signer_impl.hpp (88%)
 rename {core => include/filecoin}/vm/message/message.hpp (86%)
 rename {core => include/filecoin}/vm/message/message_signer.hpp (89%)
 rename {core => include/filecoin}/vm/message/message_util.hpp (88%)
 rename {core => include/filecoin}/vm/runtime/actor_state_handle.hpp (94%)
 rename {core => include/filecoin}/vm/runtime/env.hpp (89%)
 rename {core => include/filecoin}/vm/runtime/gas_cost.hpp (98%)
 rename {core => include/filecoin}/vm/runtime/impl/actor_state_handle_impl.hpp (93%)
 rename {core => include/filecoin}/vm/runtime/impl/runtime_impl.hpp (93%)
 rename {core => include/filecoin}/vm/runtime/runtime.hpp (92%)
 rename {core => include/filecoin}/vm/runtime/runtime_error.hpp (94%)
 rename {core => include/filecoin}/vm/runtime/runtime_types.hpp (81%)
 rename {core => include/filecoin}/vm/state/impl/state_tree_impl.hpp (92%)
 rename {core => include/filecoin}/vm/state/state_tree.hpp (94%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a36915fb96..7b3aef0a29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@ endif()
 
 include_directories(
     # project includes
-    ${PROJECT_SOURCE_DIR}/core
+    ${PROJECT_SOURCE_DIR}/include
 )
 
 if (BUILD_INTERNAL_DEPS)
diff --git a/cmake/install.cmake b/cmake/install.cmake
index 774cdb39c7..0f54dcc0e2 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -16,6 +16,11 @@ function (filecoin_install targets)
       )
 endfunction()
 
+install(
+    DIRECTORY ${CMAKE_SOURCE_DIR}/include/filecoin
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
 install(
     EXPORT filecoinConfig
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/filecoin
diff --git a/core/adt/impl/array.cpp b/core/adt/impl/array.cpp
index 9c637077ad..7212d4392c 100644
--- a/core/adt/impl/array.cpp
+++ b/core/adt/impl/array.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "adt/array.hpp"
+#include "filecoin/adt/array.hpp"
 
 namespace fc::adt {
 
diff --git a/core/adt/impl/balance_table_hamt.cpp b/core/adt/impl/balance_table_hamt.cpp
index a161202c08..e93c4a3f31 100644
--- a/core/adt/impl/balance_table_hamt.cpp
+++ b/core/adt/impl/balance_table_hamt.cpp
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "adt/balance_table_hamt.hpp"
-#include "primitives/address/address_codec.hpp"
+#include "filecoin/adt/balance_table_hamt.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
 
 using fc::adt::BalanceTableHamt;
 using fc::adt::TokenAmount;
diff --git a/core/adt/impl/multimap.cpp b/core/adt/impl/multimap.cpp
index 0e0482c079..4e0de51759 100644
--- a/core/adt/impl/multimap.cpp
+++ b/core/adt/impl/multimap.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "adt/multimap.hpp"
+#include "filecoin/adt/multimap.hpp"
 
-#include "adt/array.hpp"
+#include "filecoin/adt/array.hpp"
 
 namespace fc::adt {
 
diff --git a/core/blockchain/impl/block_validator_impl.cpp b/core/blockchain/impl/block_validator_impl.cpp
index f114acf1e9..4cc7a56041 100644
--- a/core/blockchain/impl/block_validator_impl.cpp
+++ b/core/blockchain/impl/block_validator_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "blockchain/impl/block_validator_impl.hpp"
+#include "filecoin/blockchain/impl/block_validator_impl.hpp"
 
 namespace fc::blockchain::block_validator {
   // TODO (yuraz): FIL-87 implement proper validation
diff --git a/core/blockchain/impl/weight_calculator_impl.cpp b/core/blockchain/impl/weight_calculator_impl.cpp
index 522158e7cb..45a0031c9d 100644
--- a/core/blockchain/impl/weight_calculator_impl.cpp
+++ b/core/blockchain/impl/weight_calculator_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "blockchain/impl/weight_calculator_impl.hpp"
+#include "filecoin/blockchain/impl/weight_calculator_impl.hpp"
 
 namespace fc::blockchain::weight {
   using primitives::BigInt;
diff --git a/core/blockchain/message_pool/impl/gas_price_scored_message_storage.cpp b/core/blockchain/message_pool/impl/gas_price_scored_message_storage.cpp
index b72d7c6bca..0ccee22fd2 100644
--- a/core/blockchain/message_pool/impl/gas_price_scored_message_storage.cpp
+++ b/core/blockchain/message_pool/impl/gas_price_scored_message_storage.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "blockchain/message_pool/impl/gas_price_scored_message_storage.hpp"
+#include "filecoin/blockchain/message_pool/impl/gas_price_scored_message_storage.hpp"
 
-#include "blockchain/message_pool/message_pool_error.hpp"
+#include "filecoin/blockchain/message_pool/message_pool_error.hpp"
 
 using fc::blockchain::message_pool::GasPriceScoredMessageStorage;
 using fc::blockchain::message_pool::MessagePoolError;
diff --git a/core/blockchain/message_pool/impl/message_pool_error.cpp b/core/blockchain/message_pool/impl/message_pool_error.cpp
index 826fd29dfe..b84c254524 100644
--- a/core/blockchain/message_pool/impl/message_pool_error.cpp
+++ b/core/blockchain/message_pool/impl/message_pool_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "blockchain/message_pool/message_pool_error.hpp"
+#include "filecoin/blockchain/message_pool/message_pool_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::blockchain::message_pool, MessagePoolError, e) {
   using fc::blockchain::message_pool::MessagePoolError;
diff --git a/core/blockchain/production/impl/block_producer_impl.cpp b/core/blockchain/production/impl/block_producer_impl.cpp
index 4290bd0b02..e6ee6c38e7 100644
--- a/core/blockchain/production/impl/block_producer_impl.cpp
+++ b/core/blockchain/production/impl/block_producer_impl.cpp
@@ -3,17 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "blockchain/production/impl/block_producer_impl.hpp"
+#include "filecoin/blockchain/production/impl/block_producer_impl.hpp"
 
 #include <vector>
 
 #include <gsl/span>
-#include "clock/chain_epoch_clock.hpp"
-#include "codec/cbor/cbor.hpp"
-#include "common/visitor.hpp"
-#include "primitives/cid/cid_of_cbor.hpp"
-#include "storage/amt/amt.hpp"
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/clock/chain_epoch_clock.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/common/visitor.hpp"
+#include "filecoin/primitives/cid/cid_of_cbor.hpp"
+#include "filecoin/storage/amt/amt.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 
 namespace fc::blockchain::production {
   using clock::Time;
diff --git a/core/clock/chain_epoch_clock.cpp b/core/clock/chain_epoch_clock.cpp
index bd529dbbcc..9c8b0a69a2 100644
--- a/core/clock/chain_epoch_clock.cpp
+++ b/core/clock/chain_epoch_clock.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "clock/chain_epoch_clock.hpp"
+#include "filecoin/clock/chain_epoch_clock.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::clock, EpochAtTimeError, e) {
   using fc::clock::EpochAtTimeError;
diff --git a/core/clock/impl/chain_epoch_clock_impl.cpp b/core/clock/impl/chain_epoch_clock_impl.cpp
index b92880cb31..9ebc3332ee 100644
--- a/core/clock/impl/chain_epoch_clock_impl.cpp
+++ b/core/clock/impl/chain_epoch_clock_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "clock/impl/chain_epoch_clock_impl.hpp"
+#include "filecoin/clock/impl/chain_epoch_clock_impl.hpp"
 
 namespace fc::clock {
   ChainEpochClockImpl::ChainEpochClockImpl(const Time &genesis_time)
diff --git a/core/clock/impl/utc_clock_impl.cpp b/core/clock/impl/utc_clock_impl.cpp
index 4d98fdc191..fdb9183d96 100644
--- a/core/clock/impl/utc_clock_impl.cpp
+++ b/core/clock/impl/utc_clock_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "clock/impl/utc_clock_impl.hpp"
+#include "filecoin/clock/impl/utc_clock_impl.hpp"
 
 namespace fc::clock {
   // TODO(turuslan): add NTP sync if necessary
diff --git a/core/clock/time.cpp b/core/clock/time.cpp
index fd254be072..89e2064d0f 100644
--- a/core/clock/time.cpp
+++ b/core/clock/time.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "clock/time.hpp"
+#include "filecoin/clock/time.hpp"
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 
diff --git a/core/codec/cbor/cbor_decode_stream.cpp b/core/codec/cbor/cbor_decode_stream.cpp
index 41cbe6b3b6..8bda666df7 100644
--- a/core/codec/cbor/cbor_decode_stream.cpp
+++ b/core/codec/cbor/cbor_decode_stream.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/cbor/cbor_decode_stream.hpp"
+#include "filecoin/codec/cbor/cbor_decode_stream.hpp"
 
 namespace fc::codec::cbor {
   CborDecodeStream::CborDecodeStream(gsl::span<const uint8_t> data)
diff --git a/core/codec/cbor/cbor_encode_stream.cpp b/core/codec/cbor/cbor_encode_stream.cpp
index fcf27f2228..910f8a4d58 100644
--- a/core/codec/cbor/cbor_encode_stream.cpp
+++ b/core/codec/cbor/cbor_encode_stream.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/cbor/cbor_encode_stream.hpp"
+#include "filecoin/codec/cbor/cbor_encode_stream.hpp"
 
 namespace fc::codec::cbor {
   CborEncodeStream &CborEncodeStream::operator<<(
diff --git a/core/codec/cbor/cbor_errors.cpp b/core/codec/cbor/cbor_errors.cpp
index 78f478518d..1a4ad8a0e3 100644
--- a/core/codec/cbor/cbor_errors.cpp
+++ b/core/codec/cbor/cbor_errors.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/cbor/cbor_errors.hpp"
+#include "filecoin/codec/cbor/cbor_errors.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::codec::cbor, CborEncodeError, e) {
   using fc::codec::cbor::CborEncodeError;
diff --git a/core/codec/cbor/cbor_resolve.cpp b/core/codec/cbor/cbor_resolve.cpp
index 8b9818a6df..7d0e10bdce 100644
--- a/core/codec/cbor/cbor_resolve.cpp
+++ b/core/codec/cbor/cbor_resolve.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/cbor/cbor_resolve.hpp"
+#include "filecoin/codec/cbor/cbor_resolve.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::codec::cbor, CborResolveError, e) {
   using fc::codec::cbor::CborResolveError;
diff --git a/core/codec/rle/rle_plus_encoding_stream.cpp b/core/codec/rle/rle_plus_encoding_stream.cpp
index 21aa4075c5..eee97149b9 100644
--- a/core/codec/rle/rle_plus_encoding_stream.cpp
+++ b/core/codec/rle/rle_plus_encoding_stream.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/rle/rle_plus_encoding_stream.hpp"
+#include "filecoin/codec/rle/rle_plus_encoding_stream.hpp"
 
 namespace fc::codec::rle {
   void RLEPlusEncodingStream::initContent() {
diff --git a/core/codec/rle/rle_plus_errors.cpp b/core/codec/rle/rle_plus_errors.cpp
index 33d107c2c9..aabeffa02d 100644
--- a/core/codec/rle/rle_plus_errors.cpp
+++ b/core/codec/rle/rle_plus_errors.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/rle/rle_plus_errors.hpp"
+#include "filecoin/codec/rle/rle_plus_errors.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::codec::rle, RLEPlusDecodeError, e) {
   using fc::codec::rle::RLEPlusDecodeError;
diff --git a/core/common/CMakeLists.txt b/core/common/CMakeLists.txt
index 182017e53d..c62f4f12c4 100644
--- a/core/common/CMakeLists.txt
+++ b/core/common/CMakeLists.txt
@@ -4,7 +4,6 @@
 #
 
 filecoin_add_library(filecoin_hexutil
-    hexutil.hpp
     hexutil.cpp
     )
 target_link_libraries(filecoin_hexutil
@@ -13,7 +12,6 @@ target_link_libraries(filecoin_hexutil
     )
 
 filecoin_add_library(filecoin_blob
-    blob.hpp
     blob.cpp
     )
 target_link_libraries(filecoin_blob
@@ -27,7 +25,6 @@ target_link_libraries(filecoin_outcome INTERFACE
     )
 
 filecoin_add_library(filecoin_buffer
-    buffer.hpp
     buffer.cpp
     buffer_back_insert_iterator.cpp
     )
diff --git a/core/common/blob.cpp b/core/common/blob.cpp
index 48780a67c4..1c0f83c1d0 100644
--- a/core/common/blob.cpp
+++ b/core/common/blob.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/blob.hpp"
+#include "filecoin/common/blob.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::common, BlobError, e) {
   using fc::common::BlobError;
diff --git a/core/common/buffer.cpp b/core/common/buffer.cpp
index 5e189fd206..d830ab1e89 100644
--- a/core/common/buffer.cpp
+++ b/core/common/buffer.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/buffer.hpp"
+#include "filecoin/common/buffer.hpp"
 
-#include "common/hexutil.hpp"
+#include "filecoin/common/hexutil.hpp"
 
 namespace fc::common {
 
diff --git a/core/common/buffer_back_insert_iterator.cpp b/core/common/buffer_back_insert_iterator.cpp
index e7013ce64e..87dde23de1 100644
--- a/core/common/buffer_back_insert_iterator.cpp
+++ b/core/common/buffer_back_insert_iterator.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/buffer.hpp"
+#include "filecoin/common/buffer.hpp"
 
 using fc::common::Buffer;
 
diff --git a/core/common/hexutil.cpp b/core/common/hexutil.cpp
index 536130199f..27bb680d2d 100644
--- a/core/common/hexutil.cpp
+++ b/core/common/hexutil.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/hexutil.hpp"
+#include "filecoin/common/hexutil.hpp"
 
 #include <boost/algorithm/hex.hpp>
 #include <boost/format.hpp>
diff --git a/core/common/logger.cpp b/core/common/logger.cpp
index c9528ae98f..95ba00265e 100644
--- a/core/common/logger.cpp
+++ b/core/common/logger.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/logger.hpp"
+#include "filecoin/common/logger.hpp"
 
 #include <spdlog/sinks/stdout_color_sinks.h>
 
diff --git a/core/crypto/blake2/blake2b.c b/core/crypto/blake2/blake2b.c
index 171816a28f..7b607f4437 100644
--- a/core/crypto/blake2/blake2b.c
+++ b/core/crypto/blake2/blake2b.c
@@ -6,7 +6,7 @@
 // blake2b.c
 // A simple BLAKE2b Reference Implementation.
 
-#include "blake2b.h"
+#include "filecoin/crypto/blake2/blake2b.h"
 
 // Cyclic right rotation.
 
diff --git a/core/crypto/blake2/blake2b160.cpp b/core/crypto/blake2/blake2b160.cpp
index 0247b3c6fc..4c6f1ac6c2 100644
--- a/core/crypto/blake2/blake2b160.cpp
+++ b/core/crypto/blake2/blake2b160.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/blake2/blake2b160.hpp"
+#include "filecoin/crypto/blake2/blake2b160.hpp"
 
 #include <iostream>
-#include "crypto/blake2/blake2b.h"
+#include "filecoin/crypto/blake2/blake2b.h"
 
 namespace fc::crypto::blake2b {
 
diff --git a/core/crypto/blake2/blake2s.c b/core/crypto/blake2/blake2s.c
index 5d5ef88395..aa2072c706 100644
--- a/core/crypto/blake2/blake2s.c
+++ b/core/crypto/blake2/blake2s.c
@@ -6,7 +6,7 @@
 // blake2s.c
 // A simple blake2s Reference Implementation.
 
-#include "blake2s.h"
+#include "filecoin/crypto/blake2/blake2s.h"
 
 #include <stdint.h>
 
@@ -210,4 +210,4 @@ void blake2s_256_init(blake2s_ctx *ctx_opaque) {
 
 void blake2s_256(void *out, const void *in, size_t inlen) {
   blake2s(out, _256_bits, NULL, 0, in, inlen);
-}
\ No newline at end of file
+}
diff --git a/core/crypto/bls/impl/bls_provider_impl.cpp b/core/crypto/bls/impl/bls_provider_impl.cpp
index 52767f0c8a..173611b227 100644
--- a/core/crypto/bls/impl/bls_provider_impl.cpp
+++ b/core/crypto/bls/impl/bls_provider_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
 
 #include <gsl/gsl_util>
 
diff --git a/core/crypto/hasher/hasher.cpp b/core/crypto/hasher/hasher.cpp
index 1c5b34f751..c0985977fa 100644
--- a/core/crypto/hasher/hasher.cpp
+++ b/core/crypto/hasher/hasher.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "hasher.hpp"
+#include "filecoin/crypto/hasher/hasher.hpp"
 
 #include <libp2p/crypto/sha/sha256.hpp>
-#include "crypto/blake2/blake2b160.hpp"
+#include "filecoin/crypto/blake2/blake2b160.hpp"
 
 namespace fc::crypto {
   std::map<Hasher::HashType, Hasher::HashMethod> Hasher::methods_{
diff --git a/core/crypto/murmur/murmur.cpp b/core/crypto/murmur/murmur.cpp
index 23f7161eff..0c451f4bca 100644
--- a/core/crypto/murmur/murmur.cpp
+++ b/core/crypto/murmur/murmur.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/murmur/murmur.hpp"
+#include "filecoin/crypto/murmur/murmur.hpp"
 
-#include <common/buffer.hpp>
+#include "filecoin/common/buffer.hpp"
 
 namespace fc::crypto::murmur {
   uint64_t getUint64LE(gsl::span<const uint8_t> bytes) {
diff --git a/core/crypto/randomness/impl/chain_randomness_provider_impl.cpp b/core/crypto/randomness/impl/chain_randomness_provider_impl.cpp
index b996f6beab..5107d07e74 100644
--- a/core/crypto/randomness/impl/chain_randomness_provider_impl.cpp
+++ b/core/crypto/randomness/impl/chain_randomness_provider_impl.cpp
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/randomness/impl/chain_randomness_provider_impl.hpp"
+#include "filecoin/crypto/randomness/impl/chain_randomness_provider_impl.hpp"
 
 #include <boost/assert.hpp>
 #include <libp2p/crypto/sha/sha256.hpp>
-#include "common/le_encoder.hpp"
-#include "primitives/ticket/ticket.hpp"
-#include "primitives/tipset/tipset_key.hpp"
-#include "storage/chain/chain_store.hpp"
+#include "filecoin/common/le_encoder.hpp"
+#include "filecoin/primitives/ticket/ticket.hpp"
+#include "filecoin/primitives/tipset/tipset_key.hpp"
+#include "filecoin/storage/chain/chain_store.hpp"
 
 namespace fc::crypto::randomness {
 
diff --git a/core/crypto/randomness/impl/randomness_provider_impl.cpp b/core/crypto/randomness/impl/randomness_provider_impl.cpp
index d5f8ef8050..3db6a2b4a5 100644
--- a/core/crypto/randomness/impl/randomness_provider_impl.cpp
+++ b/core/crypto/randomness/impl/randomness_provider_impl.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/randomness/impl/randomness_provider_impl.hpp"
+#include "filecoin/crypto/randomness/impl/randomness_provider_impl.hpp"
 
 #include <libp2p/crypto/sha/sha256.hpp>
-#include "common/le_encoder.hpp"
+#include "filecoin/common/le_encoder.hpp"
 
 namespace fc::crypto::randomness {
 
diff --git a/core/crypto/signature/signature.cpp b/core/crypto/signature/signature.cpp
index 65070a1d92..f3a9af09b6 100644
--- a/core/crypto/signature/signature.cpp
+++ b/core/crypto/signature/signature.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/signature/signature.hpp"
+#include "filecoin/crypto/signature/signature.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::crypto::signature, SignatureError, e) {
   using fc::crypto::signature::SignatureError;
diff --git a/core/crypto/vrf/impl/vrf_provider_impl.cpp b/core/crypto/vrf/impl/vrf_provider_impl.cpp
index 99e3cabc32..85d4655c16 100644
--- a/core/crypto/vrf/impl/vrf_provider_impl.cpp
+++ b/core/crypto/vrf/impl/vrf_provider_impl.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/vrf/impl/vrf_provider_impl.hpp"
-#include "crypto/vrf/vrf_hash_encoder.hpp"
+#include "filecoin/crypto/vrf/impl/vrf_provider_impl.hpp"
+#include "filecoin/crypto/vrf/vrf_hash_encoder.hpp"
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::crypto::vrf {
 
diff --git a/core/crypto/vrf/vrf_hash_encoder.cpp b/core/crypto/vrf/vrf_hash_encoder.cpp
index 40a56d81aa..5f9382b7a5 100644
--- a/core/crypto/vrf/vrf_hash_encoder.cpp
+++ b/core/crypto/vrf/vrf_hash_encoder.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/vrf/vrf_hash_encoder.hpp"
+#include "filecoin/crypto/vrf/vrf_hash_encoder.hpp"
 
 #include <libp2p/crypto/sha/sha256.hpp>
-#include "common/le_encoder.hpp"
-#include "primitives/address/address_codec.hpp"
+#include "filecoin/common/le_encoder.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
 
 namespace fc::crypto::vrf {
   using primitives::address::Protocol;
diff --git a/core/crypto/vrf/vrf_types.cpp b/core/crypto/vrf/vrf_types.cpp
index dbf213a9bf..c9d211f912 100644
--- a/core/crypto/vrf/vrf_types.cpp
+++ b/core/crypto/vrf/vrf_types.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/vrf/vrf_types.hpp"
+#include "filecoin/crypto/vrf/vrf_types.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::crypto::vrf, VRFError, e) {
   using fc::crypto::vrf::VRFError;
diff --git a/core/fslock/fslock.cpp b/core/fslock/fslock.cpp
index 54dfee8668..b00292a79b 100644
--- a/core/fslock/fslock.cpp
+++ b/core/fslock/fslock.cpp
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "fslock/fslock.hpp"
+#include "filecoin/fslock/fslock.hpp"
 
 #include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/interprocess/sync/named_mutex.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
 #include <iostream>
-#include "fslock/fslock_error.hpp"
+#include "filecoin/fslock/fslock_error.hpp"
 
 namespace fc::fslock {
   // TODO(artyom-yurin): [FIL-115] Should be unlocked if process died
diff --git a/core/fslock/fslock_error.cpp b/core/fslock/fslock_error.cpp
index 9c28952b51..6f92b9e84a 100644
--- a/core/fslock/fslock_error.cpp
+++ b/core/fslock/fslock_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "fslock/fslock_error.hpp"
+#include "filecoin/fslock/fslock_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::fslock, FSLockError, e) {
   using fc::fslock::FSLockError;
diff --git a/core/power/impl/power_table_error.cpp b/core/power/impl/power_table_error.cpp
index 04a35aa8a1..1b561dd2db 100644
--- a/core/power/impl/power_table_error.cpp
+++ b/core/power/impl/power_table_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "power/power_table_error.hpp"
+#include "filecoin/power/power_table_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::power, PowerTableError, e) {
   using fc::power::PowerTableError;
diff --git a/core/power/impl/power_table_hamt.cpp b/core/power/impl/power_table_hamt.cpp
index ce159a7150..b4f6c8485f 100644
--- a/core/power/impl/power_table_hamt.cpp
+++ b/core/power/impl/power_table_hamt.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "power/impl/power_table_hamt.hpp"
+#include "filecoin/power/impl/power_table_hamt.hpp"
 
-#include "power/power_table_error.hpp"
-#include "primitives/address/address_codec.hpp"
+#include "filecoin/power/power_table_error.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
 
 using fc::power::Power;
 using fc::power::PowerTableError;
diff --git a/core/power/impl/power_table_impl.cpp b/core/power/impl/power_table_impl.cpp
index f8e207e5f6..0c2113eb13 100644
--- a/core/power/impl/power_table_impl.cpp
+++ b/core/power/impl/power_table_impl.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "power/impl/power_table_impl.hpp"
+#include "filecoin/power/impl/power_table_impl.hpp"
 
-#include "power/power_table_error.hpp"
-#include "primitives/address/address_codec.hpp"
+#include "filecoin/power/power_table_error.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
 
 namespace fc::power {
 
diff --git a/core/primitives/address/CMakeLists.txt b/core/primitives/address/CMakeLists.txt
index 66f9bab08e..964c7f269b 100644
--- a/core/primitives/address/CMakeLists.txt
+++ b/core/primitives/address/CMakeLists.txt
@@ -4,7 +4,7 @@
 filecoin_add_library(filecoin_address
     address.cpp
     address_codec.cpp
-        ../piece/piece.hpp ../piece/piece.hpp)
+    )
 target_link_libraries(filecoin_address
     Boost::boost
     filecoin_blake2
diff --git a/core/primitives/address/address.cpp b/core/primitives/address/address.cpp
index 130e5b5b2d..832b0ebb3b 100644
--- a/core/primitives/address/address.cpp
+++ b/core/primitives/address/address.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/address/address.hpp"
+#include "filecoin/primitives/address/address.hpp"
 
-#include "common/visitor.hpp"
-#include "crypto/blake2/blake2b160.hpp"
+#include "filecoin/common/visitor.hpp"
+#include "filecoin/crypto/blake2/blake2b160.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::primitives::address, AddressError, e) {
   using fc::primitives::address::AddressError;
diff --git a/core/primitives/address/address_codec.cpp b/core/primitives/address/address_codec.cpp
index 180afea3a6..0cb7f53739 100644
--- a/core/primitives/address/address_codec.cpp
+++ b/core/primitives/address/address_codec.cpp
@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "address_codec.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
 
 #include <cppcodec/base32_default_rfc4648.hpp>
 #include <libp2p/multi/uvarint.hpp>
 #include <stdexcept>
 
-#include "common/visitor.hpp"
-#include "crypto/blake2/blake2b.h"
-#include "crypto/blake2/blake2b160.hpp"
-#include "crypto/bls/bls_types.hpp"
+#include "filecoin/common/visitor.hpp"
+#include "filecoin/crypto/blake2/blake2b.h"
+#include "filecoin/crypto/blake2/blake2b160.hpp"
+#include "filecoin/crypto/bls/bls_types.hpp"
 
 namespace fc::primitives::address {
 
diff --git a/core/primitives/chain/chain.cpp b/core/primitives/chain/chain.cpp
index 82e915dd93..f9ce6ea46e 100644
--- a/core/primitives/chain/chain.cpp
+++ b/core/primitives/chain/chain.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/chain/chain.hpp"
+#include "filecoin/primitives/chain/chain.hpp"
 
 namespace primitives::chain {
   // TODO(yuraz): FIL-85 currently only interface available,
diff --git a/core/primitives/chain_epoch/chain_epoch_codec.cpp b/core/primitives/chain_epoch/chain_epoch_codec.cpp
index 809a31bb2b..a122a98168 100644
--- a/core/primitives/chain_epoch/chain_epoch_codec.cpp
+++ b/core/primitives/chain_epoch/chain_epoch_codec.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/chain_epoch/chain_epoch_codec.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch_codec.hpp"
 
 #include <libp2p/multi/uvarint.hpp>
 
diff --git a/core/primitives/cid/cid.cpp b/core/primitives/cid/cid.cpp
index 4856727939..ed2d27d0b1 100644
--- a/core/primitives/cid/cid.cpp
+++ b/core/primitives/cid/cid.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/cid/cid.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
 
 #include <libp2p/multi/content_identifier_codec.hpp>
 #include <libp2p/multi/uvarint.hpp>
-#include "crypto/blake2/blake2b160.hpp"
+#include "filecoin/crypto/blake2/blake2b160.hpp"
 
 namespace fc {
   CID::CID()
diff --git a/core/primitives/cid/comm_cid.cpp b/core/primitives/cid/comm_cid.cpp
index 9925f3fc91..8ee76ab6ba 100644
--- a/core/primitives/cid/comm_cid.cpp
+++ b/core/primitives/cid/comm_cid.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/cid/comm_cid.hpp"
+#include "filecoin/primitives/cid/comm_cid.hpp"
 #include <libp2p/multi/uvarint.hpp>
-#include "primitives/cid/comm_cid_errors.hpp"
+#include "filecoin/primitives/cid/comm_cid_errors.hpp"
 
 namespace fc::common {
 
diff --git a/core/primitives/cid/comm_cid_errors.cpp b/core/primitives/cid/comm_cid_errors.cpp
index 80b2bf6d64..46d920e26b 100644
--- a/core/primitives/cid/comm_cid_errors.cpp
+++ b/core/primitives/cid/comm_cid_errors.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/cid/comm_cid_errors.hpp"
+#include "filecoin/primitives/cid/comm_cid_errors.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::common, CommCidError, e) {
   using fc::common::CommCidError;
diff --git a/core/primitives/cid/json_codec.cpp b/core/primitives/cid/json_codec.cpp
index c32133679f..b71ff7634c 100644
--- a/core/primitives/cid/json_codec.cpp
+++ b/core/primitives/cid/json_codec.cpp
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/cid/json_codec.hpp"
+#include "filecoin/primitives/cid/json_codec.hpp"
 
 #include <strstream>
 
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
-#include "codec/cbor/cbor.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
 
 namespace fc::codec::json {
   using boost::property_tree::ptree;
diff --git a/core/primitives/piece/piece.cpp b/core/primitives/piece/piece.cpp
index 7d0f9b81b1..b5856ae627 100644
--- a/core/primitives/piece/piece.cpp
+++ b/core/primitives/piece/piece.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/piece/piece.hpp"
+#include "filecoin/primitives/piece/piece.hpp"
 
 #include <utility>
-#include "piece_error.hpp"
+#include "filecoin/primitives/piece/piece_error.hpp"
 
 namespace fc::primitives::piece {
 
diff --git a/core/primitives/piece/piece_error.cpp b/core/primitives/piece/piece_error.cpp
index 957c2241fa..6075fe1255 100644
--- a/core/primitives/piece/piece_error.cpp
+++ b/core/primitives/piece/piece_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/piece/piece_error.hpp"
+#include "filecoin/primitives/piece/piece_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::primitives::piece, PieceError, e) {
   using fc::primitives::piece::PieceError;
diff --git a/core/primitives/ticket/epost_ticket.cpp b/core/primitives/ticket/epost_ticket.cpp
index 537830d40f..2aeeb3d494 100644
--- a/core/primitives/ticket/epost_ticket.cpp
+++ b/core/primitives/ticket/epost_ticket.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/ticket/epost_ticket.hpp"
+#include "filecoin/primitives/ticket/epost_ticket.hpp"
 
 namespace fc::primitives::ticket {
   bool operator==(const EPostTicket &lhs, const EPostTicket &rhs) {
diff --git a/core/primitives/ticket/epost_ticket_codec.cpp b/core/primitives/ticket/epost_ticket_codec.cpp
index c2a6bc3851..24bc1ebc83 100644
--- a/core/primitives/ticket/epost_ticket_codec.cpp
+++ b/core/primitives/ticket/epost_ticket_codec.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/ticket/epost_ticket_codec.hpp"
+#include "filecoin/primitives/ticket/epost_ticket_codec.hpp"
 
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::primitives::ticket, EPoSTTicketCodecError, e) {
diff --git a/core/primitives/ticket/ticket.cpp b/core/primitives/ticket/ticket.cpp
index 1e0252c382..40384e0db8 100644
--- a/core/primitives/ticket/ticket.cpp
+++ b/core/primitives/ticket/ticket.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/ticket/ticket.hpp"
+#include "filecoin/primitives/ticket/ticket.hpp"
 
-#include "common/le_encoder.hpp"
+#include "filecoin/common/le_encoder.hpp"
 
 namespace fc::primitives::ticket {
   using crypto::randomness::Randomness;
diff --git a/core/primitives/ticket/ticket_codec.cpp b/core/primitives/ticket/ticket_codec.cpp
index f954355cd9..50349fbea3 100644
--- a/core/primitives/ticket/ticket_codec.cpp
+++ b/core/primitives/ticket/ticket_codec.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/ticket/ticket_codec.hpp"
+#include "filecoin/primitives/ticket/ticket_codec.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::primitives::ticket, TicketCodecError, e) {
   using fc::primitives::ticket::TicketCodecError;
diff --git a/core/primitives/tipset/tipset.cpp b/core/primitives/tipset/tipset.cpp
index b1a6b0a586..49e0c10f63 100644
--- a/core/primitives/tipset/tipset.cpp
+++ b/core/primitives/tipset/tipset.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/tipset/tipset.hpp"
+#include "filecoin/primitives/tipset/tipset.hpp"
 
-#include "common/logger.hpp"
-#include "primitives/address/address_codec.hpp"
-#include "primitives/cid/cid_of_cbor.hpp"
+#include "filecoin/common/logger.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/primitives/cid/cid_of_cbor.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::primitives::tipset, TipsetError, e) {
   using fc::primitives::tipset::TipsetError;
diff --git a/core/primitives/tipset/tipset_key.cpp b/core/primitives/tipset/tipset_key.cpp
index 2c6a544f18..eb23db70ab 100644
--- a/core/primitives/tipset/tipset_key.cpp
+++ b/core/primitives/tipset/tipset_key.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/tipset/tipset_key.hpp"
+#include "filecoin/primitives/tipset/tipset_key.hpp"
 
 #include <libp2p/multi/content_identifier_codec.hpp>
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::primitives::tipset {
 
diff --git a/core/proofs/proof_param_provider.cpp b/core/proofs/proof_param_provider.cpp
index 46a98ca43c..e329b98d11 100644
--- a/core/proofs/proof_param_provider.cpp
+++ b/core/proofs/proof_param_provider.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "proofs/proof_param_provider.hpp"
+#include "filecoin/proofs/proof_param_provider.hpp"
 
 #include <cstdlib>
 #include <iostream>
@@ -18,9 +18,9 @@
 #include "boost/filesystem.hpp"
 #include "boost/lexical_cast.hpp"
 #include "boost/property_tree/json_parser.hpp"
-#include "common/outcome.hpp"
-#include "crypto/blake2/blake2b160.hpp"
-#include "proofs/proof_param_provider_error.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/crypto/blake2/blake2b160.hpp"
+#include "filecoin/proofs/proof_param_provider_error.hpp"
 
 namespace fc::proofs {
 
diff --git a/core/proofs/proof_param_provider_error.cpp b/core/proofs/proof_param_provider_error.cpp
index c810a4bbf9..3dedb1f3d8 100644
--- a/core/proofs/proof_param_provider_error.cpp
+++ b/core/proofs/proof_param_provider_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "proofs/proof_param_provider_error.hpp"
+#include "filecoin/proofs/proof_param_provider_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::proofs, ProofParamProviderError, e) {
   using fc::proofs::ProofParamProviderError;
diff --git a/core/proofs/proofs.cpp b/core/proofs/proofs.cpp
index 1320d0d951..69038d58f8 100644
--- a/core/proofs/proofs.cpp
+++ b/core/proofs/proofs.cpp
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "proofs/proofs.hpp"
+#include "filecoin/proofs/proofs.hpp"
 
 #include <fcntl.h>
 #include <filecoin-ffi/filecoin.h>
 #include "boost/filesystem/fstream.hpp"
-#include "primitives/cid/comm_cid.hpp"
-#include "proofs/proofs_error.hpp"
+#include "filecoin/primitives/cid/comm_cid.hpp"
+#include "filecoin/proofs/proofs_error.hpp"
 
 namespace fc::proofs {
 
diff --git a/core/proofs/proofs_error.cpp b/core/proofs/proofs_error.cpp
index 31740ee9d4..4283ad733a 100644
--- a/core/proofs/proofs_error.cpp
+++ b/core/proofs/proofs_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "proofs/proofs_error.hpp"
+#include "filecoin/proofs/proofs_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::proofs, ProofsError, e) {
   using fc::proofs::ProofsError;
diff --git a/core/storage/amt/amt.cpp b/core/storage/amt/amt.cpp
index 96aa22fd61..c66459decf 100644
--- a/core/storage/amt/amt.cpp
+++ b/core/storage/amt/amt.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/amt/amt.hpp"
+#include "filecoin/storage/amt/amt.hpp"
 
-#include "common/which.hpp"
+#include "filecoin/common/which.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::storage::amt, AmtError, e) {
   using fc::storage::amt::AmtError;
diff --git a/core/storage/chain/datastore_key.cpp b/core/storage/chain/datastore_key.cpp
index 07051a2d4d..8f584ca998 100644
--- a/core/storage/chain/datastore_key.cpp
+++ b/core/storage/chain/datastore_key.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/chain/datastore_key.hpp"
+#include "filecoin/storage/chain/datastore_key.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem/path.hpp>
diff --git a/core/storage/chain/impl/chain_data_store_impl.cpp b/core/storage/chain/impl/chain_data_store_impl.cpp
index 56688f4a64..aad35500bd 100644
--- a/core/storage/chain/impl/chain_data_store_impl.cpp
+++ b/core/storage/chain/impl/chain_data_store_impl.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/chain/impl/chain_data_store_impl.hpp"
+#include "filecoin/storage/chain/impl/chain_data_store_impl.hpp"
 
-#include "primitives/cid/cid_of_cbor.hpp"
+#include "filecoin/primitives/cid/cid_of_cbor.hpp"
 
 namespace fc::storage::blockchain {
   using primitives::cid::getCidOfCbor;
diff --git a/core/storage/chain/impl/chain_store_impl.cpp b/core/storage/chain/impl/chain_store_impl.cpp
index 86ae15fb6c..6eb2a6e362 100644
--- a/core/storage/chain/impl/chain_store_impl.cpp
+++ b/core/storage/chain/impl/chain_store_impl.cpp
@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/chain/impl/chain_store_impl.hpp"
-
-#include "common/outcome.hpp"
-#include "crypto/randomness/impl/chain_randomness_provider_impl.hpp"
-#include "primitives/address/address_codec.hpp"
-#include "primitives/cid/cid_of_cbor.hpp"
-#include "primitives/cid/json_codec.hpp"
-#include "primitives/tipset/tipset_key.hpp"
-#include "storage/chain/datastore_key.hpp"
+#include "filecoin/storage/chain/impl/chain_store_impl.hpp"
+
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/crypto/randomness/impl/chain_randomness_provider_impl.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/primitives/cid/cid_of_cbor.hpp"
+#include "filecoin/primitives/cid/json_codec.hpp"
+#include "filecoin/primitives/tipset/tipset_key.hpp"
+#include "filecoin/storage/chain/datastore_key.hpp"
 
 namespace fc::storage::blockchain {
   using crypto::randomness::ChainRandomnessProviderImpl;
diff --git a/core/storage/config/config.cpp b/core/storage/config/config.cpp
index c9b6889b7e..9ec62b5ea4 100644
--- a/core/storage/config/config.cpp
+++ b/core/storage/config/config.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/config/config.hpp"
+#include "filecoin/storage/config/config.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/property_tree/json_parser.hpp>
diff --git a/core/storage/config/config_error.cpp b/core/storage/config/config_error.cpp
index 6ab5833e2e..f4d990c4c9 100644
--- a/core/storage/config/config_error.cpp
+++ b/core/storage/config/config_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/config/config_error.hpp"
+#include "filecoin/storage/config/config_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::storage::config, ConfigError, e) {
   using fc::storage::config::ConfigError;
diff --git a/core/storage/filestore/filestore_error.cpp b/core/storage/filestore/filestore_error.cpp
index c1041f46a4..3bc46139c3 100644
--- a/core/storage/filestore/filestore_error.cpp
+++ b/core/storage/filestore/filestore_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/filestore/filestore_error.hpp"
+#include "filecoin/storage/filestore/filestore_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::storage::filestore, FileStoreError, e) {
   using fc::storage::filestore::FileStoreError;
diff --git a/core/storage/filestore/impl/filesystem/filesystem_file.cpp b/core/storage/filestore/impl/filesystem/filesystem_file.cpp
index 4e06352db1..43193bb18c 100644
--- a/core/storage/filestore/impl/filesystem/filesystem_file.cpp
+++ b/core/storage/filestore/impl/filesystem/filesystem_file.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/filestore/impl/filesystem/filesystem_file.hpp"
+#include "filecoin/storage/filestore/impl/filesystem/filesystem_file.hpp"
 
 #include "boost/filesystem.hpp"
-#include "storage/filestore/filestore_error.hpp"
+#include "filecoin/storage/filestore/filestore_error.hpp"
 
 using fc::storage::filestore::FileStoreError;
 using fc::storage::filestore::FileSystemFile;
diff --git a/core/storage/filestore/impl/filesystem/filesystem_filestore.cpp b/core/storage/filestore/impl/filesystem/filesystem_filestore.cpp
index ccc52c98f5..563e43c796 100644
--- a/core/storage/filestore/impl/filesystem/filesystem_filestore.cpp
+++ b/core/storage/filestore/impl/filesystem/filesystem_filestore.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/filestore/impl/filesystem/filesystem_filestore.hpp"
+#include "filecoin/storage/filestore/impl/filesystem/filesystem_filestore.hpp"
 #include "boost/filesystem.hpp"
-#include "storage/filestore/filestore_error.hpp"
-#include "storage/filestore/impl/filesystem/filesystem_file.hpp"
+#include "filecoin/storage/filestore/filestore_error.hpp"
+#include "filecoin/storage/filestore/impl/filesystem/filesystem_file.hpp"
 
 using fc::storage::filestore::File;
 using fc::storage::filestore::FileStoreError;
diff --git a/core/storage/hamt/hamt.cpp b/core/storage/hamt/hamt.cpp
index cb1214a908..adedee96d3 100644
--- a/core/storage/hamt/hamt.cpp
+++ b/core/storage/hamt/hamt.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/hamt/hamt.hpp"
+#include "filecoin/storage/hamt/hamt.hpp"
 
-#include "common/which.hpp"
-#include "crypto/murmur/murmur.hpp"
+#include "filecoin/common/which.hpp"
+#include "filecoin/crypto/murmur/murmur.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::storage::hamt, HamtError, e) {
   using fc::storage::hamt::HamtError;
diff --git a/core/storage/in_memory/in_memory_storage.cpp b/core/storage/in_memory/in_memory_storage.cpp
index ddc92ec54f..9b7dcfedec 100644
--- a/core/storage/in_memory/in_memory_storage.cpp
+++ b/core/storage/in_memory/in_memory_storage.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/in_memory/in_memory_storage.hpp"
+#include "filecoin/storage/in_memory/in_memory_storage.hpp"
 
-#include "storage/in_memory/in_memory_batch.hpp"
+#include "filecoin/storage/in_memory/in_memory_batch.hpp"
 
 using fc::common::Buffer;
 
diff --git a/core/storage/ipfs/impl/datastore_leveldb.cpp b/core/storage/ipfs/impl/datastore_leveldb.cpp
index 3c220d1142..ea68be9607 100644
--- a/core/storage/ipfs/impl/datastore_leveldb.cpp
+++ b/core/storage/ipfs/impl/datastore_leveldb.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipfs/impl/datastore_leveldb.hpp"
+#include "filecoin/storage/ipfs/impl/datastore_leveldb.hpp"
 
 #include <libp2p/multi/content_identifier_codec.hpp>
-#include <storage/leveldb/leveldb_error.hpp>
+#include "filecoin/storage/leveldb/leveldb_error.hpp"
 
 namespace fc::storage::ipfs {
   namespace {
diff --git a/core/storage/ipfs/impl/in_memory_datastore.cpp b/core/storage/ipfs/impl/in_memory_datastore.cpp
index ee60f67e36..72f24b4c02 100644
--- a/core/storage/ipfs/impl/in_memory_datastore.cpp
+++ b/core/storage/ipfs/impl/in_memory_datastore.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 
 using fc::storage::ipfs::InMemoryDatastore;
 using Value = fc::storage::ipfs::IpfsDatastore::Value;
diff --git a/core/storage/ipfs/impl/ipfs_block_service.cpp b/core/storage/ipfs/impl/ipfs_block_service.cpp
index 97452bcfba..17165f71d3 100644
--- a/core/storage/ipfs/impl/ipfs_block_service.cpp
+++ b/core/storage/ipfs/impl/ipfs_block_service.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipfs/impl/ipfs_block_service.hpp"
+#include "filecoin/storage/ipfs/impl/ipfs_block_service.hpp"
 
 namespace fc::storage::ipfs {
   IpfsBlockService::IpfsBlockService(std::shared_ptr<IpfsDatastore> data_store)
diff --git a/core/storage/ipfs/impl/ipfs_datastore_error.cpp b/core/storage/ipfs/impl/ipfs_datastore_error.cpp
index eb6854080c..6fcffa1c12 100644
--- a/core/storage/ipfs/impl/ipfs_datastore_error.cpp
+++ b/core/storage/ipfs/impl/ipfs_datastore_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipfs/ipfs_datastore_error.hpp"
+#include "filecoin/storage/ipfs/ipfs_datastore_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::storage::ipfs, IpfsDatastoreError, e) {
   using fc::storage::ipfs::IpfsDatastoreError;
diff --git a/core/storage/ipfs/merkledag/impl/leaf_impl.cpp b/core/storage/ipfs/merkledag/impl/leaf_impl.cpp
index 93d41e1c29..070da5ed12 100644
--- a/core/storage/ipfs/merkledag/impl/leaf_impl.cpp
+++ b/core/storage/ipfs/merkledag/impl/leaf_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipfs/merkledag/impl/leaf_impl.hpp"
+#include "filecoin/storage/ipfs/merkledag/impl/leaf_impl.hpp"
 
 namespace fc::storage::ipfs::merkledag {
   LeafImpl::LeafImpl(common::Buffer data)
diff --git a/core/storage/ipfs/merkledag/impl/merkledag_service_impl.cpp b/core/storage/ipfs/merkledag/impl/merkledag_service_impl.cpp
index f341ee766c..1503fc4577 100644
--- a/core/storage/ipfs/merkledag/impl/merkledag_service_impl.cpp
+++ b/core/storage/ipfs/merkledag/impl/merkledag_service_impl.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipfs/merkledag/impl/merkledag_service_impl.hpp"
+#include "filecoin/storage/ipfs/merkledag/impl/merkledag_service_impl.hpp"
 
 #include <boost/assert.hpp>
 #include <libp2p/multi/content_identifier_codec.hpp>
-#include "storage/ipld/impl/ipld_node_impl.hpp"
+#include "filecoin/storage/ipld/impl/ipld_node_impl.hpp"
 
 using libp2p::multi::ContentIdentifierCodec;
 
diff --git a/core/storage/ipld/impl/ipld_link_impl.cpp b/core/storage/ipld/impl/ipld_link_impl.cpp
index 6cacf10309..46b81826f7 100644
--- a/core/storage/ipld/impl/ipld_link_impl.cpp
+++ b/core/storage/ipld/impl/ipld_link_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipld/impl/ipld_link_impl.hpp"
+#include "filecoin/storage/ipld/impl/ipld_link_impl.hpp"
 
 namespace fc::storage::ipld {
   IPLDLinkImpl::IPLDLinkImpl(libp2p::multi::ContentIdentifier id,
diff --git a/core/storage/ipld/impl/ipld_node_decoder_pb.cpp b/core/storage/ipld/impl/ipld_node_decoder_pb.cpp
index b6c72445c4..c577913bc1 100644
--- a/core/storage/ipld/impl/ipld_node_decoder_pb.cpp
+++ b/core/storage/ipld/impl/ipld_node_decoder_pb.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipld/impl/ipld_node_decoder_pb.hpp"
+#include "filecoin/storage/ipld/impl/ipld_node_decoder_pb.hpp"
 
 namespace fc::storage::ipld {
   outcome::result<void> IPLDNodeDecoderPB::decode(
diff --git a/core/storage/ipld/impl/ipld_node_encoder_pb.cpp b/core/storage/ipld/impl/ipld_node_encoder_pb.cpp
index e2d8f52614..78dd5efb7e 100644
--- a/core/storage/ipld/impl/ipld_node_encoder_pb.cpp
+++ b/core/storage/ipld/impl/ipld_node_encoder_pb.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipld/impl/ipld_node_encoder_pb.hpp"
+#include "filecoin/storage/ipld/impl/ipld_node_encoder_pb.hpp"
 
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
diff --git a/core/storage/ipld/impl/ipld_node_impl.cpp b/core/storage/ipld/impl/ipld_node_impl.cpp
index 23ed76ae0b..f7986cb4c5 100644
--- a/core/storage/ipld/impl/ipld_node_impl.cpp
+++ b/core/storage/ipld/impl/ipld_node_impl.cpp
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipld/impl/ipld_node_impl.hpp"
+#include "filecoin/storage/ipld/impl/ipld_node_impl.hpp"
 
 #include <libp2p/crypto/sha/sha256.hpp>
 #include <libp2p/multi/content_identifier_codec.hpp>
 #include <libp2p/multi/multibase_codec/codecs/base58.hpp>
 #include <libp2p/multi/multihash.hpp>
 #include "ipld_node.pb.h"
-#include "storage/ipld/impl/ipld_node_decoder_pb.hpp"
+#include "filecoin/storage/ipld/impl/ipld_node_decoder_pb.hpp"
 
 using libp2p::common::Hash256;
 using libp2p::multi::ContentIdentifierCodec;
diff --git a/core/storage/keystore/impl/filesystem/filesystem_keystore.cpp b/core/storage/keystore/impl/filesystem/filesystem_keystore.cpp
index 709e577956..48cce95937 100644
--- a/core/storage/keystore/impl/filesystem/filesystem_keystore.cpp
+++ b/core/storage/keystore/impl/filesystem/filesystem_keystore.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "filesystem_keystore.hpp"
+#include "filecoin/storage/keystore/impl/filesystem/filesystem_keystore.hpp"
 
-#include "primitives/address/address_codec.hpp"
-#include "storage/filestore/filestore_error.hpp"
-#include "storage/filestore/impl/filesystem/filesystem_filestore.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/storage/filestore/filestore_error.hpp"
+#include "filecoin/storage/filestore/impl/filesystem/filesystem_filestore.hpp"
 
 using fc::primitives::address::Address;
 using fc::primitives::address::Protocol;
diff --git a/core/storage/keystore/impl/in_memory/in_memory_keystore.cpp b/core/storage/keystore/impl/in_memory/in_memory_keystore.cpp
index 8eb0878221..eb6c51187f 100644
--- a/core/storage/keystore/impl/in_memory/in_memory_keystore.cpp
+++ b/core/storage/keystore/impl/in_memory/in_memory_keystore.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/keystore/impl/in_memory/in_memory_keystore.hpp"
+#include "filecoin/storage/keystore/impl/in_memory/in_memory_keystore.hpp"
 
 #include <boost/foreach.hpp>
 
diff --git a/core/storage/keystore/keystore.cpp b/core/storage/keystore/keystore.cpp
index d11dc65e1c..e4117fcbdf 100644
--- a/core/storage/keystore/keystore.cpp
+++ b/core/storage/keystore/keystore.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "keystore.hpp"
+#include "filecoin/storage/keystore/keystore.hpp"
 
-#include "common/visitor.hpp"
+#include "filecoin/common/visitor.hpp"
 
 using fc::crypto::signature::Signature;
 using fc::primitives::address::Protocol;
diff --git a/core/storage/keystore/keystore_error.cpp b/core/storage/keystore/keystore_error.cpp
index 055e068f41..3455cd11ba 100644
--- a/core/storage/keystore/keystore_error.cpp
+++ b/core/storage/keystore/keystore_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/keystore/keystore_error.hpp"
+#include "filecoin/storage/keystore/keystore_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::storage::keystore, KeyStoreError, e) {
   using fc::storage::keystore::KeyStoreError;
diff --git a/core/storage/leveldb/leveldb.cpp b/core/storage/leveldb/leveldb.cpp
index aed23cb532..18c7118931 100644
--- a/core/storage/leveldb/leveldb.cpp
+++ b/core/storage/leveldb/leveldb.cpp
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/leveldb/leveldb.hpp"
+#include "filecoin/storage/leveldb/leveldb.hpp"
 
 #include <utility>
 
-#include "storage/leveldb/leveldb_batch.hpp"
-#include "storage/leveldb/leveldb_cursor.hpp"
-#include "storage/leveldb/leveldb_util.hpp"
+#include "filecoin/storage/leveldb/leveldb_batch.hpp"
+#include "filecoin/storage/leveldb/leveldb_cursor.hpp"
+#include "filecoin/storage/leveldb/leveldb_util.hpp"
 
 namespace fc::storage {
 
diff --git a/core/storage/leveldb/leveldb_batch.cpp b/core/storage/leveldb/leveldb_batch.cpp
index 4ba9d278e8..7c64f8d808 100644
--- a/core/storage/leveldb/leveldb_batch.cpp
+++ b/core/storage/leveldb/leveldb_batch.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/leveldb/leveldb_batch.hpp"
+#include "filecoin/storage/leveldb/leveldb_batch.hpp"
 
-#include "storage/leveldb/leveldb_util.hpp"
+#include "filecoin/storage/leveldb/leveldb_util.hpp"
 
 namespace fc::storage {
 
diff --git a/core/storage/leveldb/leveldb_cursor.cpp b/core/storage/leveldb/leveldb_cursor.cpp
index bece147ee5..325ffa1b73 100644
--- a/core/storage/leveldb/leveldb_cursor.cpp
+++ b/core/storage/leveldb/leveldb_cursor.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/leveldb/leveldb_cursor.hpp"
+#include "filecoin/storage/leveldb/leveldb_cursor.hpp"
 
-#include "storage/leveldb/leveldb_util.hpp"
+#include "filecoin/storage/leveldb/leveldb_util.hpp"
 
 namespace fc::storage {
 
diff --git a/core/storage/leveldb/leveldb_error.cpp b/core/storage/leveldb/leveldb_error.cpp
index 01e5033d91..f13acd7759 100644
--- a/core/storage/leveldb/leveldb_error.cpp
+++ b/core/storage/leveldb/leveldb_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/leveldb/leveldb_error.hpp"
+#include "filecoin/storage/leveldb/leveldb_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::storage, LevelDBError, e) {
   using E = fc::storage::LevelDBError;
diff --git a/core/storage/repository/impl/filesystem_repository.cpp b/core/storage/repository/impl/filesystem_repository.cpp
index 4d99f92e76..590bc00555 100644
--- a/core/storage/repository/impl/filesystem_repository.cpp
+++ b/core/storage/repository/impl/filesystem_repository.cpp
@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/repository/impl/filesystem_repository.hpp"
+#include "filecoin/storage/repository/impl/filesystem_repository.hpp"
 
 #include <utility>
 
 #include "boost/filesystem.hpp"
-#include "crypto/bls/impl/bls_provider_impl.hpp"
-#include "crypto/secp256k1/secp256k1_provider.hpp"
-#include "storage/ipfs/impl/datastore_leveldb.hpp"
-#include "storage/keystore/impl/filesystem/filesystem_keystore.hpp"
-#include "storage/repository/repository_error.hpp"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/crypto/secp256k1/secp256k1_provider.hpp"
+#include "filecoin/storage/ipfs/impl/datastore_leveldb.hpp"
+#include "filecoin/storage/keystore/impl/filesystem/filesystem_keystore.hpp"
+#include "filecoin/storage/repository/repository_error.hpp"
 
 using fc::crypto::bls::BlsProviderImpl;
 using fc::storage::ipfs::LeveldbDatastore;
diff --git a/core/storage/repository/impl/in_memory_repository.cpp b/core/storage/repository/impl/in_memory_repository.cpp
index fca437d07c..80941a48b0 100644
--- a/core/storage/repository/impl/in_memory_repository.cpp
+++ b/core/storage/repository/impl/in_memory_repository.cpp
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/repository/impl/in_memory_repository.hpp"
+#include "filecoin/storage/repository/impl/in_memory_repository.hpp"
 
-#include "crypto/bls/impl/bls_provider_impl.hpp"
-#include "crypto/secp256k1/secp256k1_provider.hpp"
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
-#include "storage/keystore/impl/in_memory/in_memory_keystore.hpp"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/crypto/secp256k1/secp256k1_provider.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/storage/keystore/impl/in_memory/in_memory_keystore.hpp"
 
 using fc::crypto::bls::BlsProviderImpl;
 using fc::storage::ipfs::InMemoryDatastore;
diff --git a/core/storage/repository/impl/repository.cpp b/core/storage/repository/impl/repository.cpp
index 1950c436c2..e7bf2e7b67 100644
--- a/core/storage/repository/impl/repository.cpp
+++ b/core/storage/repository/impl/repository.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/repository/repository.hpp"
+#include "filecoin/storage/repository/repository.hpp"
 
 using fc::storage::config::Config;
 using fc::storage::ipfs::IpfsDatastore;
diff --git a/core/storage/repository/impl/repository_error.cpp b/core/storage/repository/impl/repository_error.cpp
index 0cc3167324..0c6d2106b7 100644
--- a/core/storage/repository/impl/repository_error.cpp
+++ b/core/storage/repository/impl/repository_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/repository/repository_error.hpp"
+#include "filecoin/storage/repository/repository_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::storage::repository, RepositoryError, e) {
   using fc::storage::repository::RepositoryError;
diff --git a/core/vm/actor/actor.cpp b/core/vm/actor/actor.cpp
index ba70cff26b..57075cd737 100644
--- a/core/vm/actor/actor.cpp
+++ b/core/vm/actor/actor.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/actor.hpp"
+#include "filecoin/vm/actor/actor.hpp"
 
 #include <string>
 #include <vector>
diff --git a/core/vm/actor/builtin/account/account_actor.cpp b/core/vm/actor/builtin/account/account_actor.cpp
index 6ab120eaa4..ef509f9d42 100644
--- a/core/vm/actor/builtin/account/account_actor.cpp
+++ b/core/vm/actor/builtin/account/account_actor.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/account/account_actor.hpp"
+#include "filecoin/vm/actor/builtin/account/account_actor.hpp"
 
-#include "vm/exit_code/exit_code.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
 
 namespace fc::vm::actor::builtin::account {
 
diff --git a/core/vm/actor/builtin/cron/cron_actor.cpp b/core/vm/actor/builtin/cron/cron_actor.cpp
index 46b8cdae27..d59b922386 100644
--- a/core/vm/actor/builtin/cron/cron_actor.cpp
+++ b/core/vm/actor/builtin/cron/cron_actor.cpp
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/cron/cron_actor.hpp"
-#include "vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
+#include "filecoin/vm/actor/builtin/cron/cron_actor.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
 
 namespace fc::vm::actor::builtin::cron {
   /**
diff --git a/core/vm/actor/builtin/init/init_actor.cpp b/core/vm/actor/builtin/init/init_actor.cpp
index 6a57e871da..5a9f775841 100644
--- a/core/vm/actor/builtin/init/init_actor.cpp
+++ b/core/vm/actor/builtin/init/init_actor.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/init/init_actor.hpp"
+#include "filecoin/vm/actor/builtin/init/init_actor.hpp"
 
-#include "primitives/address/address_codec.hpp"
-#include "storage/hamt/hamt.hpp"
-#include "vm/runtime/gas_cost.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/storage/hamt/hamt.hpp"
+#include "filecoin/vm/runtime/gas_cost.hpp"
 
 namespace fc::vm::actor::builtin::init {
 
diff --git a/core/vm/actor/builtin/miner/miner_actor.cpp b/core/vm/actor/builtin/miner/miner_actor.cpp
index 78bac401d5..f5033142d8 100644
--- a/core/vm/actor/builtin/miner/miner_actor.cpp
+++ b/core/vm/actor/builtin/miner/miner_actor.cpp
@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/miner/miner_actor.hpp"
-
-#include "primitives/chain_epoch/chain_epoch_codec.hpp"
-#include "storage/amt/amt.hpp"
-#include "storage/hamt/hamt.hpp"
-#include "vm/actor/builtin/account/account_actor.hpp"
-#include "vm/actor/builtin/market/actor.hpp"
-#include "vm/actor/builtin/miner/policy.hpp"
-#include "vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
-#include "vm/exit_code/exit_code.hpp"
+#include "filecoin/vm/actor/builtin/miner/miner_actor.hpp"
+
+#include "filecoin/primitives/chain_epoch/chain_epoch_codec.hpp"
+#include "filecoin/storage/amt/amt.hpp"
+#include "filecoin/storage/hamt/hamt.hpp"
+#include "filecoin/vm/actor/builtin/account/account_actor.hpp"
+#include "filecoin/vm/actor/builtin/market/actor.hpp"
+#include "filecoin/vm/actor/builtin/miner/policy.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
 
 namespace fc::vm::actor::builtin::miner {
   using primitives::kChainEpochUndefined;
diff --git a/core/vm/actor/builtin/multisig/multisig_actor.cpp b/core/vm/actor/builtin/multisig/multisig_actor.cpp
index fe3bc0daa9..45a71912f9 100644
--- a/core/vm/actor/builtin/multisig/multisig_actor.cpp
+++ b/core/vm/actor/builtin/multisig/multisig_actor.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/multisig/multisig_actor.hpp"
+#include "filecoin/vm/actor/builtin/multisig/multisig_actor.hpp"
 
-#include "common/buffer.hpp"
-#include "common/outcome.hpp"
-#include "vm/actor/actor_method.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
 
 namespace fc::vm::actor::builtin::multisig {
 
diff --git a/core/vm/actor/builtin/payment_channel/payment_channel_actor.cpp b/core/vm/actor/builtin/payment_channel/payment_channel_actor.cpp
index 01667b9d65..f1fd80a5ff 100644
--- a/core/vm/actor/builtin/payment_channel/payment_channel_actor.cpp
+++ b/core/vm/actor/builtin/payment_channel/payment_channel_actor.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/payment_channel/payment_channel_actor.hpp"
+#include "filecoin/vm/actor/builtin/payment_channel/payment_channel_actor.hpp"
 
-#include "vm/actor/actor_method.hpp"
-#include "vm/exit_code/exit_code.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
 
 using fc::outcome::result;
 using fc::primitives::address::Protocol;
diff --git a/core/vm/actor/builtin/reward/reward_actor.cpp b/core/vm/actor/builtin/reward/reward_actor.cpp
index 781c20e202..3597644418 100644
--- a/core/vm/actor/builtin/reward/reward_actor.cpp
+++ b/core/vm/actor/builtin/reward/reward_actor.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/reward/reward_actor.hpp"
+#include "filecoin/vm/actor/builtin/reward/reward_actor.hpp"
 
-#include "adt/multimap.hpp"
-#include "primitives/address/address_codec.hpp"
-#include "vm/exit_code/exit_code.hpp"
+#include "filecoin/adt/multimap.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
 
 using fc::adt::Multimap;
 
diff --git a/core/vm/actor/builtin/shared/shared.cpp b/core/vm/actor/builtin/shared/shared.cpp
index b9f2156901..7a26fad035 100644
--- a/core/vm/actor/builtin/shared/shared.cpp
+++ b/core/vm/actor/builtin/shared/shared.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/shared/shared.hpp"
-#include "adt/balance_table_hamt.hpp"
-#include "codec/cbor/cbor.hpp"
+#include "filecoin/vm/actor/builtin/shared/shared.hpp"
+#include "filecoin/adt/balance_table_hamt.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
 
 namespace fc::vm::actor::builtin {
 
diff --git a/core/vm/actor/builtin/storage_power/policy.cpp b/core/vm/actor/builtin/storage_power/policy.cpp
index 47e4770588..5f5c92a93f 100644
--- a/core/vm/actor/builtin/storage_power/policy.cpp
+++ b/core/vm/actor/builtin/storage_power/policy.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/storage_power/policy.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/policy.hpp"
 
 #include <boost/multiprecision/cpp_int.hpp>
 
diff --git a/core/vm/actor/builtin/storage_power/storage_power_actor_export.cpp b/core/vm/actor/builtin/storage_power/storage_power_actor_export.cpp
index 18dad3514b..e8fa76acc0 100644
--- a/core/vm/actor/builtin/storage_power/storage_power_actor_export.cpp
+++ b/core/vm/actor/builtin/storage_power/storage_power_actor_export.cpp
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
 
-#include "vm/actor/builtin/init/init_actor.hpp"
-#include "vm/actor/builtin/miner/miner_actor.hpp"
-#include "vm/actor/builtin/shared/shared.hpp"
-#include "vm/actor/builtin/storage_power/storage_power_actor_state.hpp"
+#include "filecoin/vm/actor/builtin/init/init_actor.hpp"
+#include "filecoin/vm/actor/builtin/miner/miner_actor.hpp"
+#include "filecoin/vm/actor/builtin/shared/shared.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/storage_power_actor_state.hpp"
 
 namespace fc::vm::actor::builtin::storage_power {
 
diff --git a/core/vm/actor/builtin/storage_power/storage_power_actor_state.cpp b/core/vm/actor/builtin/storage_power/storage_power_actor_state.cpp
index c026eec325..f32834b50e 100644
--- a/core/vm/actor/builtin/storage_power/storage_power_actor_state.cpp
+++ b/core/vm/actor/builtin/storage_power/storage_power_actor_state.cpp
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/storage_power/storage_power_actor_state.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/storage_power_actor_state.hpp"
 
-#include "power/impl/power_table_hamt.hpp"
-#include "primitives/address/address_codec.hpp"
-#include "primitives/chain_epoch/chain_epoch_codec.hpp"
-#include "vm/exit_code/exit_code.hpp"
+#include "filecoin/power/impl/power_table_hamt.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch_codec.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
 
 namespace fc::vm::actor::builtin::storage_power {
 
diff --git a/core/vm/actor/impl/invoker_impl.cpp b/core/vm/actor/impl/invoker_impl.cpp
index 7ad29eb513..5c4ce5f1fc 100644
--- a/core/vm/actor/impl/invoker_impl.cpp
+++ b/core/vm/actor/impl/invoker_impl.cpp
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/impl/invoker_impl.hpp"
+#include "filecoin/vm/actor/impl/invoker_impl.hpp"
 
-#include "vm/actor/builtin/account/account_actor.hpp"
-#include "vm/actor/builtin/cron/cron_actor.hpp"
-#include "vm/actor/builtin/init/init_actor.hpp"
-#include "vm/actor/builtin/miner/miner_actor.hpp"
-#include "vm/actor/builtin/multisig/multisig_actor.hpp"
-#include "vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
+#include "filecoin/vm/actor/builtin/account/account_actor.hpp"
+#include "filecoin/vm/actor/builtin/cron/cron_actor.hpp"
+#include "filecoin/vm/actor/builtin/init/init_actor.hpp"
+#include "filecoin/vm/actor/builtin/miner/miner_actor.hpp"
+#include "filecoin/vm/actor/builtin/multisig/multisig_actor.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
 
 namespace fc::vm::actor {
 
diff --git a/core/vm/exit_code/impl/exit_code.cpp b/core/vm/exit_code/impl/exit_code.cpp
index f0cf99dc02..c6d01ef25f 100644
--- a/core/vm/exit_code/impl/exit_code.cpp
+++ b/core/vm/exit_code/impl/exit_code.cpp
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/exit_code/exit_code.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
 
 #include <sstream>
 
 #include <boost/assert.hpp>
 
-#include "common/enum.hpp"
+#include "filecoin/common/enum.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::vm, VMExitCode, e) {
   return "vm exit code";
diff --git a/core/vm/interpreter/impl/interpreter_impl.cpp b/core/vm/interpreter/impl/interpreter_impl.cpp
index 248a4bd7f0..491f7217f9 100644
--- a/core/vm/interpreter/impl/interpreter_impl.cpp
+++ b/core/vm/interpreter/impl/interpreter_impl.cpp
@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/interpreter/impl/interpreter_impl.hpp"
-
-#include "crypto/randomness/randomness_provider.hpp"
-#include "storage/amt/amt.hpp"
-#include "vm/actor/builtin/cron/cron_actor.hpp"
-#include "vm/actor/builtin/miner/miner_actor.hpp"
-#include "vm/actor/impl/invoker_impl.hpp"
-#include "vm/runtime/gas_cost.hpp"
-#include "vm/runtime/impl/runtime_impl.hpp"
+#include "filecoin/vm/interpreter/impl/interpreter_impl.hpp"
+
+#include "filecoin/crypto/randomness/randomness_provider.hpp"
+#include "filecoin/storage/amt/amt.hpp"
+#include "filecoin/vm/actor/builtin/cron/cron_actor.hpp"
+#include "filecoin/vm/actor/builtin/miner/miner_actor.hpp"
+#include "filecoin/vm/actor/impl/invoker_impl.hpp"
+#include "filecoin/vm/runtime/gas_cost.hpp"
+#include "filecoin/vm/runtime/impl/runtime_impl.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::vm::interpreter, InterpreterError, e) {
   using E = fc::vm::interpreter::InterpreterError;
diff --git a/core/vm/message/impl/message_signer_impl.cpp b/core/vm/message/impl/message_signer_impl.cpp
index c6c236788c..51cb70b9f3 100644
--- a/core/vm/message/impl/message_signer_impl.cpp
+++ b/core/vm/message/impl/message_signer_impl.cpp
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/message/impl/message_signer_impl.hpp"
-#include "vm/message/message_util.hpp"
+#include "filecoin/vm/message/impl/message_signer_impl.hpp"
+#include "filecoin/vm/message/message_util.hpp"
 
 namespace fc::vm::message {
 
diff --git a/core/vm/message/message.cpp b/core/vm/message/message.cpp
index 67313aed5a..bb200f7fde 100644
--- a/core/vm/message/message.cpp
+++ b/core/vm/message/message.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/message/message.hpp"
+#include "filecoin/vm/message/message.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::vm::message, MessageError, e) {
   using fc::vm::message::MessageError;
diff --git a/core/vm/message/message_util.cpp b/core/vm/message/message_util.cpp
index 2be63b693b..3e6b9ceabc 100644
--- a/core/vm/message/message_util.cpp
+++ b/core/vm/message/message_util.cpp
@@ -2,10 +2,10 @@
  * Copyright Soramitsu Co., Ltd. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-#include "vm/message/message_util.hpp"
+#include "filecoin/vm/message/message_util.hpp"
 
-#include "codec/cbor/cbor.hpp"
-#include "crypto/signature/signature.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/crypto/signature/signature.hpp"
 
 namespace fc::vm::message {
 
diff --git a/core/vm/runtime/impl/actor_state_handle_impl.cpp b/core/vm/runtime/impl/actor_state_handle_impl.cpp
index 0529a361ff..a05c104383 100644
--- a/core/vm/runtime/impl/actor_state_handle_impl.cpp
+++ b/core/vm/runtime/impl/actor_state_handle_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/runtime/impl/actor_state_handle_impl.hpp"
+#include "filecoin/vm/runtime/impl/actor_state_handle_impl.hpp"
 
 using fc::vm::actor::ActorSubstateCID;
 using fc::vm::runtime::ActorStateHandleImpl;
diff --git a/core/vm/runtime/impl/env.cpp b/core/vm/runtime/impl/env.cpp
index 2fe977a57a..78a0bd641c 100644
--- a/core/vm/runtime/impl/env.cpp
+++ b/core/vm/runtime/impl/env.cpp
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/runtime/env.hpp"
+#include "filecoin/vm/runtime/env.hpp"
 
-#include "vm/actor/builtin/account/account_actor.hpp"
-#include "vm/exit_code/exit_code.hpp"
-#include "vm/runtime/gas_cost.hpp"
-#include "vm/runtime/impl/runtime_impl.hpp"
-#include "vm/runtime/runtime_error.hpp"
+#include "filecoin/vm/actor/builtin/account/account_actor.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
+#include "filecoin/vm/runtime/gas_cost.hpp"
+#include "filecoin/vm/runtime/impl/runtime_impl.hpp"
+#include "filecoin/vm/runtime/runtime_error.hpp"
 
 namespace fc::vm::runtime {
   using actor::kSendMethodNumber;
diff --git a/core/vm/runtime/impl/runtime_error.cpp b/core/vm/runtime/impl/runtime_error.cpp
index 8c0861d9eb..a6c75fde19 100644
--- a/core/vm/runtime/impl/runtime_error.cpp
+++ b/core/vm/runtime/impl/runtime_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/runtime/runtime_error.hpp"
+#include "filecoin/vm/runtime/runtime_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::vm::runtime, RuntimeError, e) {
   using fc::vm::runtime::RuntimeError;
diff --git a/core/vm/runtime/impl/runtime_impl.cpp b/core/vm/runtime/impl/runtime_impl.cpp
index 8ef5ec69a2..7b52d48915 100644
--- a/core/vm/runtime/impl/runtime_impl.cpp
+++ b/core/vm/runtime/impl/runtime_impl.cpp
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/runtime/impl/runtime_impl.hpp"
+#include "filecoin/vm/runtime/impl/runtime_impl.hpp"
 
-#include "codec/cbor/cbor.hpp"
-#include "vm/actor/builtin/account/account_actor.hpp"
-#include "vm/runtime/gas_cost.hpp"
-#include "vm/runtime/impl/actor_state_handle_impl.hpp"
-#include "vm/runtime/runtime_error.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/vm/actor/builtin/account/account_actor.hpp"
+#include "filecoin/vm/runtime/gas_cost.hpp"
+#include "filecoin/vm/runtime/impl/actor_state_handle_impl.hpp"
+#include "filecoin/vm/runtime/runtime_error.hpp"
 
 namespace fc::vm::runtime {
 
diff --git a/core/vm/state/impl/state_tree_impl.cpp b/core/vm/state/impl/state_tree_impl.cpp
index c4a5a2e670..af07e8fca7 100644
--- a/core/vm/state/impl/state_tree_impl.cpp
+++ b/core/vm/state/impl/state_tree_impl.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/state/impl/state_tree_impl.hpp"
+#include "filecoin/vm/state/impl/state_tree_impl.hpp"
 
-#include "codec/cbor/cbor.hpp"
-#include "primitives/address/address_codec.hpp"
-#include "vm/actor/builtin/init/init_actor.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/vm/actor/builtin/init/init_actor.hpp"
 
 namespace fc::vm::state {
   using actor::ActorSubstateCID;
diff --git a/core/adt/array.hpp b/include/filecoin/adt/array.hpp
similarity index 89%
rename from core/adt/array.hpp
rename to include/filecoin/adt/array.hpp
index e09ed455c4..669532fd53 100644
--- a/core/adt/array.hpp
+++ b/include/filecoin/adt/array.hpp
@@ -6,11 +6,11 @@
 #ifndef CPP_FILECOIN_ARRAY_HPP
 #define CPP_FILECOIN_ARRAY_HPP
 
-#include "codec/cbor/cbor.hpp"
-#include "common/outcome.hpp"
-#include "primitives/cid/cid.hpp"
-#include "storage/amt/amt.hpp"
-#include "storage/ipfs/datastore.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/storage/amt/amt.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
 
 namespace fc::adt {
 
diff --git a/core/adt/balance_table_hamt.hpp b/include/filecoin/adt/balance_table_hamt.hpp
similarity index 89%
rename from core/adt/balance_table_hamt.hpp
rename to include/filecoin/adt/balance_table_hamt.hpp
index 60e219333a..a857deb60d 100644
--- a/core/adt/balance_table_hamt.hpp
+++ b/include/filecoin/adt/balance_table_hamt.hpp
@@ -6,12 +6,12 @@
 #ifndef CPP_FILECOIN_ADT_BALANCE_TABLE_HAMT_HPP
 #define CPP_FILECOIN_ADT_BALANCE_TABLE_HAMT_HPP
 
-#include "common/outcome.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/cid/cid.hpp"
-#include "primitives/types.hpp"
-#include "storage/hamt/hamt.hpp"
-#include "storage/ipfs/datastore.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/primitives/types.hpp"
+#include "filecoin/storage/hamt/hamt.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
 
 namespace fc::adt {
 
diff --git a/core/adt/multimap.hpp b/include/filecoin/adt/multimap.hpp
similarity index 91%
rename from core/adt/multimap.hpp
rename to include/filecoin/adt/multimap.hpp
index da5240a21a..23b8214cb1 100644
--- a/core/adt/multimap.hpp
+++ b/include/filecoin/adt/multimap.hpp
@@ -6,10 +6,10 @@
 #ifndef CPP_FILECOIN_MULTIMAP_HPP
 #define CPP_FILECOIN_MULTIMAP_HPP
 
-#include "common/outcome.hpp"
-#include "primitives/cid/cid.hpp"
-#include "storage/hamt/hamt.hpp"
-#include "storage/ipfs/datastore.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/storage/hamt/hamt.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
 
 namespace fc::adt {
 
diff --git a/core/blockchain/block_validator.hpp b/include/filecoin/blockchain/block_validator.hpp
similarity index 93%
rename from core/blockchain/block_validator.hpp
rename to include/filecoin/blockchain/block_validator.hpp
index eb41fc5ef9..b39ab460d6 100644
--- a/core/blockchain/block_validator.hpp
+++ b/include/filecoin/blockchain/block_validator.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CHAIN_BLOCK_VALIDATOR_HPP
 #define CPP_FILECOIN_CORE_CHAIN_BLOCK_VALIDATOR_HPP
 
-#include "primitives/block/block.hpp"
+#include "filecoin/primitives/block/block.hpp"
 
 namespace fc::blockchain::block_validator {
 
diff --git a/core/blockchain/chain_manager.hpp b/include/filecoin/blockchain/chain_manager.hpp
similarity index 100%
rename from core/blockchain/chain_manager.hpp
rename to include/filecoin/blockchain/chain_manager.hpp
diff --git a/core/blockchain/chain_tips_manager.hpp b/include/filecoin/blockchain/chain_tips_manager.hpp
similarity index 96%
rename from core/blockchain/chain_tips_manager.hpp
rename to include/filecoin/blockchain/chain_tips_manager.hpp
index dbee565822..cfdc8b3054 100644
--- a/core/blockchain/chain_tips_manager.hpp
+++ b/include/filecoin/blockchain/chain_tips_manager.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_PRIMITIVES_CHAIN_CHAIN_TIPS_MANAGER_HPP
 #define CPP_FILECOIN_CORE_PRIMITIVES_CHAIN_CHAIN_TIPS_MANAGER_HPP
 
-#include "primitives/tipset/tipset.hpp"
+#include "filecoin/primitives/tipset/tipset.hpp"
 
 namespace fc::primitives::chain {
 
diff --git a/core/blockchain/impl/block_validator_impl.hpp b/include/filecoin/blockchain/impl/block_validator_impl.hpp
similarity index 92%
rename from core/blockchain/impl/block_validator_impl.hpp
rename to include/filecoin/blockchain/impl/block_validator_impl.hpp
index 1b2d4b07e8..5b3a4315e4 100644
--- a/core/blockchain/impl/block_validator_impl.hpp
+++ b/include/filecoin/blockchain/impl/block_validator_impl.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CHAIN_IMPL_BLOCK_VALIDATOR_IMPL_HPP
 #define CPP_FILECOIN_CORE_CHAIN_IMPL_BLOCK_VALIDATOR_IMPL_HPP
 
-#include "blockchain/block_validator.hpp"
+#include "filecoin/blockchain/block_validator.hpp"
 
 namespace fc::blockchain::block_validator {
 
diff --git a/core/blockchain/impl/weight_calculator_impl.hpp b/include/filecoin/blockchain/impl/weight_calculator_impl.hpp
similarity index 92%
rename from core/blockchain/impl/weight_calculator_impl.hpp
rename to include/filecoin/blockchain/impl/weight_calculator_impl.hpp
index 1c37fb49c7..c5a7a6f0bb 100644
--- a/core/blockchain/impl/weight_calculator_impl.hpp
+++ b/include/filecoin/blockchain/impl/weight_calculator_impl.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CHAIN_IMPL_WEIGHT_CALCULATOR_IMPL_HPP
 #define CPP_FILECOIN_CORE_CHAIN_IMPL_WEIGHT_CALCULATOR_IMPL_HPP
 
-#include "blockchain/weight_calculator.hpp"
+#include "filecoin/blockchain/weight_calculator.hpp"
 
 namespace fc::blockchain::weight {
 
diff --git a/core/blockchain/message_pool/impl/gas_price_scored_message_storage.hpp b/include/filecoin/blockchain/message_pool/impl/gas_price_scored_message_storage.hpp
similarity index 96%
rename from core/blockchain/message_pool/impl/gas_price_scored_message_storage.hpp
rename to include/filecoin/blockchain/message_pool/impl/gas_price_scored_message_storage.hpp
index 8af7fdf71f..6ae6d5f544 100644
--- a/core/blockchain/message_pool/impl/gas_price_scored_message_storage.hpp
+++ b/include/filecoin/blockchain/message_pool/impl/gas_price_scored_message_storage.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_BLOCKCHAIN_MESSAGE_POOL_GAS_PRICE_SCORED_MESSAGE_STORAGE_HPP
 #define CPP_FILECOIN_BLOCKCHAIN_MESSAGE_POOL_GAS_PRICE_SCORED_MESSAGE_STORAGE_HPP
 
-#include "blockchain/message_pool/message_storage.hpp"
+#include "filecoin/blockchain/message_pool/message_storage.hpp"
 
 namespace fc::blockchain::message_pool {
 
diff --git a/core/blockchain/message_pool/message_pool_error.hpp b/include/filecoin/blockchain/message_pool/message_pool_error.hpp
similarity index 93%
rename from core/blockchain/message_pool/message_pool_error.hpp
rename to include/filecoin/blockchain/message_pool/message_pool_error.hpp
index 106a2558db..8528645c65 100644
--- a/core/blockchain/message_pool/message_pool_error.hpp
+++ b/include/filecoin/blockchain/message_pool/message_pool_error.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_BLOCKCHAIN_MESSAGE_POOL_ERROR
 #define FILECOIN_CORE_BLOCKCHAIN_MESSAGE_POOL_ERROR
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::blockchain::message_pool {
 
diff --git a/core/blockchain/message_pool/message_storage.hpp b/include/filecoin/blockchain/message_pool/message_storage.hpp
similarity index 90%
rename from core/blockchain/message_pool/message_storage.hpp
rename to include/filecoin/blockchain/message_pool/message_storage.hpp
index 6d10f69601..4fa4dd1ebc 100644
--- a/core/blockchain/message_pool/message_storage.hpp
+++ b/include/filecoin/blockchain/message_pool/message_storage.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_BLOCKCHAIN_MESSAGE_POOL_MESSAGE_STORAGE_HPP
 #define CPP_FILECOIN_BLOCKCHAIN_MESSAGE_POOL_MESSAGE_STORAGE_HPP
 
-#include "common/outcome.hpp"
-#include "primitives/address/address.hpp"
-#include "vm/message/message.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/vm/message/message.hpp"
 
 namespace fc::blockchain::message_pool {
 
diff --git a/core/blockchain/production/block_producer.hpp b/include/filecoin/blockchain/production/block_producer.hpp
similarity index 82%
rename from core/blockchain/production/block_producer.hpp
rename to include/filecoin/blockchain/production/block_producer.hpp
index d3a7a0042f..0f93c75048 100644
--- a/core/blockchain/production/block_producer.hpp
+++ b/include/filecoin/blockchain/production/block_producer.hpp
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/outcome.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/block/block.hpp"
-#include "primitives/ticket/epost_ticket.hpp"
-#include "primitives/ticket/ticket.hpp"
-#include "vm/indices/indices.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/block/block.hpp"
+#include "filecoin/primitives/ticket/epost_ticket.hpp"
+#include "filecoin/primitives/ticket/ticket.hpp"
+#include "filecoin/vm/indices/indices.hpp"
 
 namespace fc::blockchain::production {
   /**
diff --git a/core/blockchain/production/impl/block_producer_impl.hpp b/include/filecoin/blockchain/production/impl/block_producer_impl.hpp
similarity index 85%
rename from core/blockchain/production/impl/block_producer_impl.hpp
rename to include/filecoin/blockchain/production/impl/block_producer_impl.hpp
index 75c0098590..5eba78e611 100644
--- a/core/blockchain/production/impl/block_producer_impl.hpp
+++ b/include/filecoin/blockchain/production/impl/block_producer_impl.hpp
@@ -5,16 +5,16 @@
 
 #include <memory>
 
-#include "blockchain/message_pool/message_storage.hpp"
-#include "blockchain/production/block_producer.hpp"
-#include "blockchain/weight_calculator.hpp"
-#include "clock/chain_epoch_clock.hpp"
-#include "clock/utc_clock.hpp"
-#include "crypto/bls/bls_provider.hpp"
-#include "primitives/block/block.hpp"
-#include "primitives/tipset/tipset.hpp"
-#include "storage/ipfs/datastore.hpp"
-#include "vm/interpreter/interpreter.hpp"
+#include "filecoin/blockchain/message_pool/message_storage.hpp"
+#include "filecoin/blockchain/production/block_producer.hpp"
+#include "filecoin/blockchain/weight_calculator.hpp"
+#include "filecoin/clock/chain_epoch_clock.hpp"
+#include "filecoin/clock/utc_clock.hpp"
+#include "filecoin/crypto/bls/bls_provider.hpp"
+#include "filecoin/primitives/block/block.hpp"
+#include "filecoin/primitives/tipset/tipset.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/vm/interpreter/interpreter.hpp"
 
 namespace fc::blockchain::production {
   namespace config {
diff --git a/core/blockchain/weight_calculator.hpp b/include/filecoin/blockchain/weight_calculator.hpp
similarity index 88%
rename from core/blockchain/weight_calculator.hpp
rename to include/filecoin/blockchain/weight_calculator.hpp
index 21139e898b..e48dd6dc44 100644
--- a/core/blockchain/weight_calculator.hpp
+++ b/include/filecoin/blockchain/weight_calculator.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_STORAGE_CHAIN_WEIGHTCALCULATOR_HPP
 #define CPP_FILECOIN_CORE_STORAGE_CHAIN_WEIGHTCALCULATOR_HPP
 
-#include "primitives/big_int.hpp"
-#include "primitives/tipset/tipset.hpp"
+#include "filecoin/primitives/big_int.hpp"
+#include "filecoin/primitives/tipset/tipset.hpp"
 
 namespace fc::blockchain::weight {
   /**
diff --git a/core/clock/chain_epoch_clock.hpp b/include/filecoin/clock/chain_epoch_clock.hpp
similarity index 89%
rename from core/clock/chain_epoch_clock.hpp
rename to include/filecoin/clock/chain_epoch_clock.hpp
index 69530670b7..b300e7ee62 100644
--- a/core/clock/chain_epoch_clock.hpp
+++ b/include/filecoin/clock/chain_epoch_clock.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_CLOCK_CHAIN_EPOCH_CLOCK_HPP
 #define CPP_FILECOIN_CORE_CLOCK_CHAIN_EPOCH_CLOCK_HPP
 
-#include "clock/time.hpp"
-#include "primitives/chain_epoch/chain_epoch.hpp"
+#include "filecoin/clock/time.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch.hpp"
 
 namespace fc::clock {
   enum class EpochAtTimeError { BEFORE_GENESIS = 1 };
diff --git a/core/clock/impl/chain_epoch_clock_impl.hpp b/include/filecoin/clock/impl/chain_epoch_clock_impl.hpp
similarity index 92%
rename from core/clock/impl/chain_epoch_clock_impl.hpp
rename to include/filecoin/clock/impl/chain_epoch_clock_impl.hpp
index a18c9f92e8..76b6f2bc21 100644
--- a/core/clock/impl/chain_epoch_clock_impl.hpp
+++ b/include/filecoin/clock/impl/chain_epoch_clock_impl.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CLOCK_IMPL_CHAIN_EPOCH_CLOCK_IMPL_HPP
 #define CPP_FILECOIN_CORE_CLOCK_IMPL_CHAIN_EPOCH_CLOCK_IMPL_HPP
 
-#include "clock/chain_epoch_clock.hpp"
+#include "filecoin/clock/chain_epoch_clock.hpp"
 
 namespace fc::clock {
   class ChainEpochClockImpl : public ChainEpochClock {
diff --git a/core/clock/impl/utc_clock_impl.hpp b/include/filecoin/clock/impl/utc_clock_impl.hpp
similarity index 91%
rename from core/clock/impl/utc_clock_impl.hpp
rename to include/filecoin/clock/impl/utc_clock_impl.hpp
index 836417a34a..84f94a22b7 100644
--- a/core/clock/impl/utc_clock_impl.hpp
+++ b/include/filecoin/clock/impl/utc_clock_impl.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CLOCK_IMPL_UTC_CLOCK_IMPL_HPP
 #define CPP_FILECOIN_CORE_CLOCK_IMPL_UTC_CLOCK_IMPL_HPP
 
-#include "clock/utc_clock.hpp"
+#include "filecoin/clock/utc_clock.hpp"
 
 namespace fc::clock {
   class UTCClockImpl : public UTCClock {
diff --git a/core/clock/time.hpp b/include/filecoin/clock/time.hpp
similarity index 95%
rename from core/clock/time.hpp
rename to include/filecoin/clock/time.hpp
index 2c5b0995ae..89b61c4b0f 100644
--- a/core/clock/time.hpp
+++ b/include/filecoin/clock/time.hpp
@@ -9,7 +9,7 @@
 #include <chrono>
 #include <string>
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::clock {
   enum class TimeFromStringError { INVALID_FORMAT = 1 };
diff --git a/core/clock/utc_clock.hpp b/include/filecoin/clock/utc_clock.hpp
similarity index 92%
rename from core/clock/utc_clock.hpp
rename to include/filecoin/clock/utc_clock.hpp
index fc8a612a19..7eb969cdde 100644
--- a/core/clock/utc_clock.hpp
+++ b/include/filecoin/clock/utc_clock.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CLOCK_UTC_CLOCK_HPP
 #define CPP_FILECOIN_CORE_CLOCK_UTC_CLOCK_HPP
 
-#include "clock/time.hpp"
+#include "filecoin/clock/time.hpp"
 
 namespace fc::clock {
   /**
diff --git a/core/codec/cbor/cbor.hpp b/include/filecoin/codec/cbor/cbor.hpp
similarity index 88%
rename from core/codec/cbor/cbor.hpp
rename to include/filecoin/codec/cbor/cbor.hpp
index 1fbedfd156..337176a198 100644
--- a/core/codec/cbor/cbor.hpp
+++ b/include/filecoin/codec/cbor/cbor.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_CORE_CODEC_CBOR_CBOR_HPP
 #define CPP_FILECOIN_CORE_CODEC_CBOR_CBOR_HPP
 
-#include "codec/cbor/cbor_decode_stream.hpp"
-#include "codec/cbor/cbor_encode_stream.hpp"
-#include "codec/cbor/cbor_resolve.hpp"
+#include "filecoin/codec/cbor/cbor_decode_stream.hpp"
+#include "filecoin/codec/cbor/cbor_encode_stream.hpp"
+#include "filecoin/codec/cbor/cbor_resolve.hpp"
 
 namespace fc::codec::cbor {
   /**
diff --git a/core/codec/cbor/cbor_common.hpp b/include/filecoin/codec/cbor/cbor_common.hpp
similarity index 77%
rename from core/codec/cbor/cbor_common.hpp
rename to include/filecoin/codec/cbor/cbor_common.hpp
index 46815b5fd8..aca0fbdc2f 100644
--- a/core/codec/cbor/cbor_common.hpp
+++ b/include/filecoin/codec/cbor/cbor_common.hpp
@@ -11,9 +11,9 @@
 #include <boost/optional.hpp>
 #include <libp2p/multi/content_identifier_codec.hpp>
 
-#include "codec/cbor/cbor_errors.hpp"
-#include "common/outcome_throw.hpp"
-#include "primitives/cid/cid.hpp"
+#include "filecoin/codec/cbor/cbor_errors.hpp"
+#include "filecoin/common/outcome_throw.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
 
 namespace fc::codec::cbor {
   constexpr uint64_t kCidTag = 42;
diff --git a/core/codec/cbor/cbor_decode_stream.hpp b/include/filecoin/codec/cbor/cbor_decode_stream.hpp
similarity index 98%
rename from core/codec/cbor/cbor_decode_stream.hpp
rename to include/filecoin/codec/cbor/cbor_decode_stream.hpp
index ebc9e97b12..d6f1cdf72a 100644
--- a/core/codec/cbor/cbor_decode_stream.hpp
+++ b/include/filecoin/codec/cbor/cbor_decode_stream.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CODEC_CBOR_CBOR_DECODE_STREAM_HPP
 #define CPP_FILECOIN_CORE_CODEC_CBOR_CBOR_DECODE_STREAM_HPP
 
-#include "codec/cbor/cbor_common.hpp"
+#include "filecoin/codec/cbor/cbor_common.hpp"
 
 #include <vector>
 
diff --git a/core/codec/cbor/cbor_encode_stream.hpp b/include/filecoin/codec/cbor/cbor_encode_stream.hpp
similarity index 97%
rename from core/codec/cbor/cbor_encode_stream.hpp
rename to include/filecoin/codec/cbor/cbor_encode_stream.hpp
index ec1da34104..84cb04f591 100644
--- a/core/codec/cbor/cbor_encode_stream.hpp
+++ b/include/filecoin/codec/cbor/cbor_encode_stream.hpp
@@ -6,14 +6,14 @@
 #ifndef CPP_FILECOIN_CORE_CODEC_CBOR_CBOR_ENCODE_STREAM_HPP
 #define CPP_FILECOIN_CORE_CODEC_CBOR_CBOR_ENCODE_STREAM_HPP
 
-#include "codec/cbor/cbor_common.hpp"
+#include "filecoin/codec/cbor/cbor_common.hpp"
 
 #include <array>
 #include <vector>
 
 #include <tinycbor/cbor.h>
 
-#include "common/enum.hpp"
+#include "filecoin/common/enum.hpp"
 
 namespace fc::codec::cbor {
   /** Encodes CBOR */
diff --git a/core/codec/cbor/cbor_errors.hpp b/include/filecoin/codec/cbor/cbor_errors.hpp
similarity index 94%
rename from core/codec/cbor/cbor_errors.hpp
rename to include/filecoin/codec/cbor/cbor_errors.hpp
index e06da53492..c55aa99d54 100644
--- a/core/codec/cbor/cbor_errors.hpp
+++ b/include/filecoin/codec/cbor/cbor_errors.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CODEC_CBOR_CBOR_ERRORS_HPP
 #define CPP_FILECOIN_CORE_CODEC_CBOR_CBOR_ERRORS_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::codec::cbor {
   enum class CborEncodeError { INVALID_CID = 1, EXPECTED_MAP_VALUE_SINGLE };
diff --git a/core/codec/cbor/cbor_resolve.hpp b/include/filecoin/codec/cbor/cbor_resolve.hpp
similarity index 93%
rename from core/codec/cbor/cbor_resolve.hpp
rename to include/filecoin/codec/cbor/cbor_resolve.hpp
index 891a5b3f77..e1197dd175 100644
--- a/core/codec/cbor/cbor_resolve.hpp
+++ b/include/filecoin/codec/cbor/cbor_resolve.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CODEC_CBOR_CBOR_RESOLVE_HPP
 #define CPP_FILECOIN_CORE_CODEC_CBOR_CBOR_RESOLVE_HPP
 
-#include "codec/cbor/cbor_decode_stream.hpp"
+#include "filecoin/codec/cbor/cbor_decode_stream.hpp"
 
 namespace fc::codec::cbor {
   enum class CborResolveError {
diff --git a/core/codec/cbor/streams_annotation.hpp b/include/filecoin/codec/cbor/streams_annotation.hpp
similarity index 100%
rename from core/codec/cbor/streams_annotation.hpp
rename to include/filecoin/codec/cbor/streams_annotation.hpp
diff --git a/core/codec/rle/rle_plus.hpp b/include/filecoin/codec/rle/rle_plus.hpp
similarity index 86%
rename from core/codec/rle/rle_plus.hpp
rename to include/filecoin/codec/rle/rle_plus.hpp
index ee90f9a596..ce26d328e8 100644
--- a/core/codec/rle/rle_plus.hpp
+++ b/include/filecoin/codec/rle/rle_plus.hpp
@@ -6,10 +6,10 @@
 #ifndef CODEC_RLE_PLUS_HPP
 #define CODEC_RLE_PLUS_HPP
 
-#include "common/outcome.hpp"
-#include "codec/rle/rle_plus_errors.hpp"
-#include "codec/rle/rle_plus_decoding_stream.hpp"
-#include "codec/rle/rle_plus_encoding_stream.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/codec/rle/rle_plus_errors.hpp"
+#include "filecoin/codec/rle/rle_plus_decoding_stream.hpp"
+#include "filecoin/codec/rle/rle_plus_encoding_stream.hpp"
 
 namespace fc::codec::rle {
   /**
diff --git a/core/codec/rle/rle_plus_config.hpp b/include/filecoin/codec/rle/rle_plus_config.hpp
similarity index 100%
rename from core/codec/rle/rle_plus_config.hpp
rename to include/filecoin/codec/rle/rle_plus_config.hpp
diff --git a/core/codec/rle/rle_plus_decoding_stream.hpp b/include/filecoin/codec/rle/rle_plus_decoding_stream.hpp
similarity index 98%
rename from core/codec/rle/rle_plus_decoding_stream.hpp
rename to include/filecoin/codec/rle/rle_plus_decoding_stream.hpp
index adf7904193..42851f75fd 100644
--- a/core/codec/rle/rle_plus_decoding_stream.hpp
+++ b/include/filecoin/codec/rle/rle_plus_decoding_stream.hpp
@@ -12,8 +12,8 @@
 #include <boost/dynamic_bitset.hpp>
 #include <gsl/span>
 
-#include "codec/rle/rle_plus_config.hpp"
-#include "codec/rle/rle_plus_errors.hpp"
+#include "filecoin/codec/rle/rle_plus_config.hpp"
+#include "filecoin/codec/rle/rle_plus_errors.hpp"
 
 namespace fc::codec::rle {
   /**
diff --git a/core/codec/rle/rle_plus_encoding_stream.hpp b/include/filecoin/codec/rle/rle_plus_encoding_stream.hpp
similarity index 98%
rename from core/codec/rle/rle_plus_encoding_stream.hpp
rename to include/filecoin/codec/rle/rle_plus_encoding_stream.hpp
index 4c6c4f1bb3..900ea290fd 100644
--- a/core/codec/rle/rle_plus_encoding_stream.hpp
+++ b/include/filecoin/codec/rle/rle_plus_encoding_stream.hpp
@@ -11,7 +11,7 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "codec/rle/rle_plus_config.hpp"
+#include "filecoin/codec/rle/rle_plus_config.hpp"
 
 namespace fc::codec::rle {
   /**
diff --git a/core/codec/rle/rle_plus_errors.hpp b/include/filecoin/codec/rle/rle_plus_errors.hpp
similarity index 95%
rename from core/codec/rle/rle_plus_errors.hpp
rename to include/filecoin/codec/rle/rle_plus_errors.hpp
index dfd90543b8..ef4b33c600 100644
--- a/core/codec/rle/rle_plus_errors.hpp
+++ b/include/filecoin/codec/rle/rle_plus_errors.hpp
@@ -6,7 +6,7 @@
 #ifndef CORE_CODEC_RLE_PLUS_ERRORS_HPP
 #define CORE_CODEC_RLE_PLUS_ERRORS_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::codec::rle {
 
diff --git a/core/common/blob.hpp b/include/filecoin/common/blob.hpp
similarity index 99%
rename from core/common/blob.hpp
rename to include/filecoin/common/blob.hpp
index eb71130447..b8f5242ceb 100644
--- a/core/common/blob.hpp
+++ b/include/filecoin/common/blob.hpp
@@ -10,7 +10,7 @@
 
 #include <boost/format.hpp>
 #include <boost/functional/hash.hpp>
-#include "common/hexutil.hpp"
+#include "filecoin/common/hexutil.hpp"
 
 namespace fc::common {
 
diff --git a/core/common/buffer.hpp b/include/filecoin/common/buffer.hpp
similarity index 98%
rename from core/common/buffer.hpp
rename to include/filecoin/common/buffer.hpp
index a015ca134d..af74899301 100644
--- a/core/common/buffer.hpp
+++ b/include/filecoin/common/buffer.hpp
@@ -12,8 +12,8 @@
 #include <string_view>
 #include <vector>
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "common/outcome.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::common {
 
diff --git a/core/common/enum.hpp b/include/filecoin/common/enum.hpp
similarity index 100%
rename from core/common/enum.hpp
rename to include/filecoin/common/enum.hpp
diff --git a/core/common/hexutil.hpp b/include/filecoin/common/hexutil.hpp
similarity index 97%
rename from core/common/hexutil.hpp
rename to include/filecoin/common/hexutil.hpp
index d83b1f1a2c..94a707390d 100644
--- a/core/common/hexutil.hpp
+++ b/include/filecoin/common/hexutil.hpp
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include <gsl/span>
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::common {
 
diff --git a/core/common/le_encoder.hpp b/include/filecoin/common/le_encoder.hpp
similarity index 96%
rename from core/common/le_encoder.hpp
rename to include/filecoin/common/le_encoder.hpp
index fc8b320d08..20af4a2673 100644
--- a/core/common/le_encoder.hpp
+++ b/include/filecoin/common/le_encoder.hpp
@@ -7,7 +7,7 @@
 #define CPP_FILECOIN_CORE_COMMON_LE_ENCODER_HPP
 
 #include <boost/endian/buffers.hpp>
-#include "common/buffer.hpp"
+#include "filecoin/common/buffer.hpp"
 
 namespace fc::common {
   /**
diff --git a/core/common/logger.hpp b/include/filecoin/common/logger.hpp
similarity index 100%
rename from core/common/logger.hpp
rename to include/filecoin/common/logger.hpp
diff --git a/core/common/outcome.hpp b/include/filecoin/common/outcome.hpp
similarity index 100%
rename from core/common/outcome.hpp
rename to include/filecoin/common/outcome.hpp
diff --git a/core/common/outcome_throw.hpp b/include/filecoin/common/outcome_throw.hpp
similarity index 100%
rename from core/common/outcome_throw.hpp
rename to include/filecoin/common/outcome_throw.hpp
diff --git a/core/common/visitor.hpp b/include/filecoin/common/visitor.hpp
similarity index 100%
rename from core/common/visitor.hpp
rename to include/filecoin/common/visitor.hpp
diff --git a/core/common/which.hpp b/include/filecoin/common/which.hpp
similarity index 100%
rename from core/common/which.hpp
rename to include/filecoin/common/which.hpp
diff --git a/core/crypto/blake2/blake2b.h b/include/filecoin/crypto/blake2/blake2b.h
similarity index 100%
rename from core/crypto/blake2/blake2b.h
rename to include/filecoin/crypto/blake2/blake2b.h
diff --git a/core/crypto/blake2/blake2b160.hpp b/include/filecoin/crypto/blake2/blake2b160.hpp
similarity index 93%
rename from core/crypto/blake2/blake2b160.hpp
rename to include/filecoin/crypto/blake2/blake2b160.hpp
index 5a23772e74..ca8fd1238b 100644
--- a/core/crypto/blake2/blake2b160.hpp
+++ b/include/filecoin/crypto/blake2/blake2b160.hpp
@@ -8,8 +8,8 @@
 
 #include <gsl/span>
 
-#include "common/blob.hpp"
-#include "common/outcome.hpp"
+#include "filecoin/common/blob.hpp"
+#include "filecoin/common/outcome.hpp"
 #include <fstream>
 
 namespace fc::crypto::blake2b {
diff --git a/core/crypto/blake2/blake2s.h b/include/filecoin/crypto/blake2/blake2s.h
similarity index 100%
rename from core/crypto/blake2/blake2s.h
rename to include/filecoin/crypto/blake2/blake2s.h
diff --git a/core/crypto/bls/bls_provider.hpp b/include/filecoin/crypto/bls/bls_provider.hpp
similarity index 97%
rename from core/crypto/bls/bls_provider.hpp
rename to include/filecoin/crypto/bls/bls_provider.hpp
index 60320dfed0..4c2a7a637c 100644
--- a/core/crypto/bls/bls_provider.hpp
+++ b/include/filecoin/crypto/bls/bls_provider.hpp
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include <gsl/span>
-#include "crypto/bls/bls_types.hpp"
+#include "filecoin/crypto/bls/bls_types.hpp"
 
 namespace fc::crypto::bls {
   /**
diff --git a/core/crypto/bls/bls_types.hpp b/include/filecoin/crypto/bls/bls_types.hpp
similarity index 90%
rename from core/crypto/bls/bls_types.hpp
rename to include/filecoin/crypto/bls/bls_types.hpp
index d9dec6f2d9..79e257c485 100644
--- a/core/crypto/bls/bls_types.hpp
+++ b/include/filecoin/crypto/bls/bls_types.hpp
@@ -9,10 +9,10 @@
 #include <array>
 
 extern "C" {
-#include "crypto/bls/libbls_signatures.h"
+#include "filecoin/crypto/bls/libbls_signatures.h"
 }
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::crypto::bls {
 
diff --git a/core/crypto/bls/impl/bls_provider_impl.hpp b/include/filecoin/crypto/bls/impl/bls_provider_impl.hpp
similarity index 96%
rename from core/crypto/bls/impl/bls_provider_impl.hpp
rename to include/filecoin/crypto/bls/impl/bls_provider_impl.hpp
index 98e83da0fc..01fa0d5c19 100644
--- a/core/crypto/bls/impl/bls_provider_impl.hpp
+++ b/include/filecoin/crypto/bls/impl/bls_provider_impl.hpp
@@ -6,7 +6,7 @@
 #ifndef CRYPTO_BLS_PROVIDER_IMPL_HPP
 #define CRYPTO_BLS_PROVIDER_IMPL_HPP
 
-#include "crypto/bls/bls_provider.hpp"
+#include "filecoin/crypto/bls/bls_provider.hpp"
 
 namespace fc::crypto::bls {
   class BlsProviderImpl : public BlsProvider {
diff --git a/core/crypto/bls/libbls_signatures.h b/include/filecoin/crypto/bls/libbls_signatures.h
similarity index 100%
rename from core/crypto/bls/libbls_signatures.h
rename to include/filecoin/crypto/bls/libbls_signatures.h
diff --git a/core/crypto/hasher/hasher.hpp b/include/filecoin/crypto/hasher/hasher.hpp
similarity index 100%
rename from core/crypto/hasher/hasher.hpp
rename to include/filecoin/crypto/hasher/hasher.hpp
diff --git a/core/crypto/murmur/murmur.hpp b/include/filecoin/crypto/murmur/murmur.hpp
similarity index 100%
rename from core/crypto/murmur/murmur.hpp
rename to include/filecoin/crypto/murmur/murmur.hpp
diff --git a/core/crypto/randomness/chain_randomness_provider.hpp b/include/filecoin/crypto/randomness/chain_randomness_provider.hpp
similarity index 88%
rename from core/crypto/randomness/chain_randomness_provider.hpp
rename to include/filecoin/crypto/randomness/chain_randomness_provider.hpp
index 275fd5018e..d636b56ac8 100644
--- a/core/crypto/randomness/chain_randomness_provider.hpp
+++ b/include/filecoin/crypto/randomness/chain_randomness_provider.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_CRYPTO_RANDOMNESS_CHAIN_RANDOMNESS_PROVIDER_HPP
 #define CPP_FILECOIN_CORE_CRYPTO_RANDOMNESS_CHAIN_RANDOMNESS_PROVIDER_HPP
 
-#include "crypto/randomness/randomness_types.hpp"
-#include "primitives/cid/cid.hpp"
+#include "filecoin/crypto/randomness/randomness_types.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
 
 namespace fc::crypto::randomness {
 
diff --git a/core/crypto/randomness/impl/chain_randomness_provider_impl.hpp b/include/filecoin/crypto/randomness/impl/chain_randomness_provider_impl.hpp
similarity index 88%
rename from core/crypto/randomness/impl/chain_randomness_provider_impl.hpp
rename to include/filecoin/crypto/randomness/impl/chain_randomness_provider_impl.hpp
index 5b716fda2d..30c4351b73 100644
--- a/core/crypto/randomness/impl/chain_randomness_provider_impl.hpp
+++ b/include/filecoin/crypto/randomness/impl/chain_randomness_provider_impl.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_CRYPTO_RANDOMNESS_IMPL_CHAIN_RANDOMNESS_PROVIDER_IMPL_HPP
 #define CPP_FILECOIN_CORE_CRYPTO_RANDOMNESS_IMPL_CHAIN_RANDOMNESS_PROVIDER_IMPL_HPP
 
-#include "crypto/randomness/chain_randomness_provider.hpp"
-#include "storage/chain/chain_store.hpp"
+#include "filecoin/crypto/randomness/chain_randomness_provider.hpp"
+#include "filecoin/storage/chain/chain_store.hpp"
 
 namespace fc::crypto::randomness {
   class ChainRandomnessProviderImpl : public ChainRandomnessProvider {
diff --git a/core/crypto/randomness/impl/randomness_provider_impl.hpp b/include/filecoin/crypto/randomness/impl/randomness_provider_impl.hpp
similarity index 95%
rename from core/crypto/randomness/impl/randomness_provider_impl.hpp
rename to include/filecoin/crypto/randomness/impl/randomness_provider_impl.hpp
index 12635266a5..aa38932a14 100644
--- a/core/crypto/randomness/impl/randomness_provider_impl.hpp
+++ b/include/filecoin/crypto/randomness/impl/randomness_provider_impl.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CRYPTO_RANDOMNESS_IMPL_RANDOMNESS_PROVIDER_HPP
 #define CPP_FILECOIN_CORE_CRYPTO_RANDOMNESS_IMPL_RANDOMNESS_PROVIDER_HPP
 
-#include "crypto/randomness/randomness_provider.hpp"
+#include "filecoin/crypto/randomness/randomness_provider.hpp"
 
 namespace fc::crypto::randomness {
 
diff --git a/core/crypto/randomness/randomness_provider.hpp b/include/filecoin/crypto/randomness/randomness_provider.hpp
similarity index 92%
rename from core/crypto/randomness/randomness_provider.hpp
rename to include/filecoin/crypto/randomness/randomness_provider.hpp
index f3ac6e6667..1519f787ec 100644
--- a/core/crypto/randomness/randomness_provider.hpp
+++ b/include/filecoin/crypto/randomness/randomness_provider.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_CRYPTO_RANDOMNESS_RANDOMNESS_PROVIDER_HPP
 #define CPP_FILECOIN_CORE_CRYPTO_RANDOMNESS_RANDOMNESS_PROVIDER_HPP
 
-#include "crypto/randomness/randomness_types.hpp"
-#include "primitives/chain_epoch/chain_epoch.hpp"
+#include "filecoin/crypto/randomness/randomness_types.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch.hpp"
 
 namespace fc::crypto::randomness {
 
diff --git a/core/crypto/randomness/randomness_types.hpp b/include/filecoin/crypto/randomness/randomness_types.hpp
similarity index 90%
rename from core/crypto/randomness/randomness_types.hpp
rename to include/filecoin/crypto/randomness/randomness_types.hpp
index 8b2df9f94a..f653c2ac2c 100644
--- a/core/crypto/randomness/randomness_types.hpp
+++ b/include/filecoin/crypto/randomness/randomness_types.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_CRYPTO_RANDOMNESS_RANDOMNESS_HPP
 #define CPP_FILECOIN_CORE_CRYPTO_RANDOMNESS_RANDOMNESS_HPP
 
-#include "common/blob.hpp"
-#include "common/buffer.hpp"
+#include "filecoin/common/blob.hpp"
+#include "filecoin/common/buffer.hpp"
 
 namespace fc::crypto::randomness {
 
diff --git a/core/crypto/secp256k1/secp256k1_provider.hpp b/include/filecoin/crypto/secp256k1/secp256k1_provider.hpp
similarity index 100%
rename from core/crypto/secp256k1/secp256k1_provider.hpp
rename to include/filecoin/crypto/secp256k1/secp256k1_provider.hpp
diff --git a/core/crypto/signature/signature.hpp b/include/filecoin/crypto/signature/signature.hpp
similarity index 91%
rename from core/crypto/signature/signature.hpp
rename to include/filecoin/crypto/signature/signature.hpp
index 41fa8c0ee3..46ca8738f6 100644
--- a/core/crypto/signature/signature.hpp
+++ b/include/filecoin/crypto/signature/signature.hpp
@@ -8,11 +8,11 @@
 
 #include <boost/variant.hpp>
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "common/outcome_throw.hpp"
-#include "common/visitor.hpp"
-#include "crypto/bls/bls_types.hpp"
-#include "crypto/secp256k1/secp256k1_provider.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/common/outcome_throw.hpp"
+#include "filecoin/common/visitor.hpp"
+#include "filecoin/crypto/bls/bls_types.hpp"
+#include "filecoin/crypto/secp256k1/secp256k1_provider.hpp"
 
 namespace fc::crypto::signature {
   enum class SignatureError {
diff --git a/core/crypto/vrf/impl/vrf_provider_impl.hpp b/include/filecoin/crypto/vrf/impl/vrf_provider_impl.hpp
similarity index 90%
rename from core/crypto/vrf/impl/vrf_provider_impl.hpp
rename to include/filecoin/crypto/vrf/impl/vrf_provider_impl.hpp
index bf095f8bb1..2e801745e0 100644
--- a/core/crypto/vrf/impl/vrf_provider_impl.hpp
+++ b/include/filecoin/crypto/vrf/impl/vrf_provider_impl.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_CRYPTO_VRF_IMPL_VRF_PROVIDER_IMPL_HPP
 #define CPP_FILECOIN_CORE_CRYPTO_VRF_IMPL_VRF_PROVIDER_IMPL_HPP
 
-#include "crypto/bls/bls_provider.hpp"
-#include "crypto/vrf/vrf_provider.hpp"
+#include "filecoin/crypto/bls/bls_provider.hpp"
+#include "filecoin/crypto/vrf/vrf_provider.hpp"
 
 namespace fc::crypto::vrf {
 
diff --git a/core/crypto/vrf/vrf_hash_encoder.hpp b/include/filecoin/crypto/vrf/vrf_hash_encoder.hpp
similarity index 94%
rename from core/crypto/vrf/vrf_hash_encoder.hpp
rename to include/filecoin/crypto/vrf/vrf_hash_encoder.hpp
index 6d8ad63096..1ee677ad6d 100644
--- a/core/crypto/vrf/vrf_hash_encoder.hpp
+++ b/include/filecoin/crypto/vrf/vrf_hash_encoder.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CRYPTO_VRF_VRF_HASH_ENCODER_HPP
 #define CPP_FILECOIN_CORE_CRYPTO_VRF_VRF_HASH_ENCODER_HPP
 
-#include "crypto/vrf/vrf_types.hpp"
+#include "filecoin/crypto/vrf/vrf_types.hpp"
 
 namespace fc::crypto::vrf {
 
diff --git a/core/crypto/vrf/vrf_provider.hpp b/include/filecoin/crypto/vrf/vrf_provider.hpp
similarity index 97%
rename from core/crypto/vrf/vrf_provider.hpp
rename to include/filecoin/crypto/vrf/vrf_provider.hpp
index bfa9bca82b..d4081895d5 100644
--- a/core/crypto/vrf/vrf_provider.hpp
+++ b/include/filecoin/crypto/vrf/vrf_provider.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_CRYPTO_VRF_VRF_PROVIDER_HPP
 #define CPP_FILECOIN_CORE_CRYPTO_VRF_VRF_PROVIDER_HPP
 
-#include "crypto/vrf/vrf_types.hpp"
+#include "filecoin/crypto/vrf/vrf_types.hpp"
 
 namespace fc::crypto::vrf {
 
diff --git a/core/crypto/vrf/vrf_types.hpp b/include/filecoin/crypto/vrf/vrf_types.hpp
similarity index 86%
rename from core/crypto/vrf/vrf_types.hpp
rename to include/filecoin/crypto/vrf/vrf_types.hpp
index a184747ad4..fb71cd0d22 100644
--- a/core/crypto/vrf/vrf_types.hpp
+++ b/include/filecoin/crypto/vrf/vrf_types.hpp
@@ -6,11 +6,11 @@
 #ifndef CPP_FILECOIN_CORE_CRYPTO_VRF_VRF_TYPES_HPP
 #define CPP_FILECOIN_CORE_CRYPTO_VRF_VRF_TYPES_HPP
 
-#include "common/blob.hpp"
-#include "common/buffer.hpp"
-#include "crypto/bls/bls_types.hpp"
-#include "crypto/randomness/randomness_types.hpp"
-#include "primitives/address/address.hpp"
+#include "filecoin/common/blob.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/crypto/bls/bls_types.hpp"
+#include "filecoin/crypto/randomness/randomness_types.hpp"
+#include "filecoin/primitives/address/address.hpp"
 
 namespace fc::crypto::vrf {
 
diff --git a/core/fslock/fslock.hpp b/include/filecoin/fslock/fslock.hpp
similarity index 94%
rename from core/fslock/fslock.hpp
rename to include/filecoin/fslock/fslock.hpp
index e9eaac81c2..1486a8060d 100644
--- a/core/fslock/fslock.hpp
+++ b/include/filecoin/fslock/fslock.hpp
@@ -8,7 +8,7 @@
 
 #include <boost/interprocess/sync/file_lock.hpp>
 #include <string>
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::fslock {
   class Locker {
diff --git a/core/fslock/fslock_error.hpp b/include/filecoin/fslock/fslock_error.hpp
similarity index 92%
rename from core/fslock/fslock_error.hpp
rename to include/filecoin/fslock/fslock_error.hpp
index 07271392ac..d09139ca38 100644
--- a/core/fslock/fslock_error.hpp
+++ b/include/filecoin/fslock/fslock_error.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_FSLOCK_FSLOCK_ERROR_HPP
 #define FILECOIN_CORE_FSLOCK_FSLOCK_ERROR_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::fslock {
 
diff --git a/core/power/impl/power_table_hamt.hpp b/include/filecoin/power/impl/power_table_hamt.hpp
similarity index 95%
rename from core/power/impl/power_table_hamt.hpp
rename to include/filecoin/power/impl/power_table_hamt.hpp
index 3cdede3c66..aa3186716b 100644
--- a/core/power/impl/power_table_hamt.hpp
+++ b/include/filecoin/power/impl/power_table_hamt.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_POWER_POWER_TABLE_HAMT_HPP
 #define CPP_FILECOIN_POWER_POWER_TABLE_HAMT_HPP
 
-#include "power/power_table.hpp"
-#include "storage/hamt/hamt.hpp"
+#include "filecoin/power/power_table.hpp"
+#include "filecoin/storage/hamt/hamt.hpp"
 
 namespace fc::power {
 
diff --git a/core/power/impl/power_table_impl.hpp b/include/filecoin/power/impl/power_table_impl.hpp
similarity index 96%
rename from core/power/impl/power_table_impl.hpp
rename to include/filecoin/power/impl/power_table_impl.hpp
index 8aa3d74316..1836845c96 100644
--- a/core/power/impl/power_table_impl.hpp
+++ b/include/filecoin/power/impl/power_table_impl.hpp
@@ -7,7 +7,7 @@
 #define FILECOIN_CORE_STORAGE_POWER_TABLE_IMPL_HPP
 
 #include <unordered_map>
-#include "power/power_table.hpp"
+#include "filecoin/power/power_table.hpp"
 
 namespace fc::power {
 
diff --git a/core/power/power_table.hpp b/include/filecoin/power/power_table.hpp
similarity index 93%
rename from core/power/power_table.hpp
rename to include/filecoin/power/power_table.hpp
index 0b6165c970..5e717a659c 100644
--- a/core/power/power_table.hpp
+++ b/include/filecoin/power/power_table.hpp
@@ -6,9 +6,9 @@
 #ifndef FILECOIN_CORE_POWER_TABLE_HPP
 #define FILECOIN_CORE_POWER_TABLE_HPP
 
-#include "common/outcome.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/big_int.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/big_int.hpp"
 
 namespace fc::power {
 
diff --git a/core/power/power_table_error.hpp b/include/filecoin/power/power_table_error.hpp
similarity index 92%
rename from core/power/power_table_error.hpp
rename to include/filecoin/power/power_table_error.hpp
index 2e0f0c3f1d..203213beac 100644
--- a/core/power/power_table_error.hpp
+++ b/include/filecoin/power/power_table_error.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_POWER_POWER_TABLE_ERROR_HPP
 #define FILECOIN_CORE_POWER_POWER_TABLE_ERROR_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::power {
 
diff --git a/core/primitives/address/address.hpp b/include/filecoin/primitives/address/address.hpp
similarity index 95%
rename from core/primitives/address/address.hpp
rename to include/filecoin/primitives/address/address.hpp
index fd452c4549..2aad83c2de 100644
--- a/core/primitives/address/address.hpp
+++ b/include/filecoin/primitives/address/address.hpp
@@ -9,9 +9,9 @@
 #include <cstdint>
 
 #include <boost/variant.hpp>
-#include "common/blob.hpp"
-#include "crypto/bls/bls_types.hpp"
-#include "crypto/secp256k1/secp256k1_provider.hpp"
+#include "filecoin/common/blob.hpp"
+#include "filecoin/crypto/bls/bls_types.hpp"
+#include "filecoin/crypto/secp256k1/secp256k1_provider.hpp"
 
 namespace fc::primitives::address {
   using Sec256k1PublicKey = libp2p::crypto::secp256k1::PublicKey;
diff --git a/core/primitives/address/address_codec.hpp b/include/filecoin/primitives/address/address_codec.hpp
similarity index 93%
rename from core/primitives/address/address_codec.hpp
rename to include/filecoin/primitives/address/address_codec.hpp
index 9f30b9afec..54fe17ce30 100644
--- a/core/primitives/address/address_codec.hpp
+++ b/include/filecoin/primitives/address/address_codec.hpp
@@ -10,9 +10,9 @@
 #include <vector>
 
 #include "address.hpp"
-#include "codec/cbor/streams_annotation.hpp"
-#include "common/outcome.hpp"
-#include "common/outcome_throw.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/common/outcome_throw.hpp"
 
 namespace fc::primitives::address {
 
diff --git a/core/primitives/big_int.hpp b/include/filecoin/primitives/big_int.hpp
similarity index 94%
rename from core/primitives/big_int.hpp
rename to include/filecoin/primitives/big_int.hpp
index 0ef978b015..f772212b2b 100644
--- a/core/primitives/big_int.hpp
+++ b/include/filecoin/primitives/big_int.hpp
@@ -8,7 +8,7 @@
 
 #include <boost/multiprecision/cpp_int.hpp>
 
-#include "codec/cbor/streams_annotation.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
 
 namespace fc::primitives {
   using BigInt = boost::multiprecision::cpp_int;
diff --git a/core/primitives/block/block.hpp b/include/filecoin/primitives/block/block.hpp
similarity index 81%
rename from core/primitives/block/block.hpp
rename to include/filecoin/primitives/block/block.hpp
index 635feb7655..02c78b9404 100644
--- a/core/primitives/block/block.hpp
+++ b/include/filecoin/primitives/block/block.hpp
@@ -9,18 +9,18 @@
 #include <boost/assert.hpp>
 #include <boost/optional.hpp>
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "crypto/signature/signature.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/address/address_codec.hpp"
-#include "primitives/big_int.hpp"
-#include "primitives/cid/cid.hpp"
-#include "primitives/ticket/epost_ticket.hpp"
-#include "primitives/ticket/epost_ticket_codec.hpp"
-#include "primitives/ticket/ticket.hpp"
-#include "primitives/ticket/ticket_codec.hpp"
-#include "storage/ipld/ipld_block_common.hpp"
-#include "vm/message/message.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/crypto/signature/signature.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/primitives/big_int.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/primitives/ticket/epost_ticket.hpp"
+#include "filecoin/primitives/ticket/epost_ticket_codec.hpp"
+#include "filecoin/primitives/ticket/ticket.hpp"
+#include "filecoin/primitives/ticket/ticket_codec.hpp"
+#include "filecoin/storage/ipld/ipld_block_common.hpp"
+#include "filecoin/vm/message/message.hpp"
 
 namespace fc::primitives::block {
   using primitives::BigInt;
diff --git a/core/primitives/boost_multiprecision.hpp b/include/filecoin/primitives/boost_multiprecision.hpp
similarity index 100%
rename from core/primitives/boost_multiprecision.hpp
rename to include/filecoin/primitives/boost_multiprecision.hpp
diff --git a/core/primitives/chain/chain.hpp b/include/filecoin/primitives/chain/chain.hpp
similarity index 90%
rename from core/primitives/chain/chain.hpp
rename to include/filecoin/primitives/chain/chain.hpp
index a57b79d3e7..4d644a2e11 100644
--- a/core/primitives/chain/chain.hpp
+++ b/include/filecoin/primitives/chain/chain.hpp
@@ -6,10 +6,10 @@
 #ifndef CPP_FILECOIN_CORE_PRIMITIVES_CHAIN_CHAIN_HPP
 #define CPP_FILECOIN_CORE_PRIMITIVES_CHAIN_CHAIN_HPP
 
-#include "common/outcome.hpp"
-#include "crypto/randomness/randomness_types.hpp"
-#include "primitives/chain_epoch/chain_epoch.hpp"
-#include "primitives/tipset/tipset.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/crypto/randomness/randomness_types.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch.hpp"
+#include "filecoin/primitives/tipset/tipset.hpp"
 
 namespace fc::primitives::chain {
   /**
diff --git a/core/primitives/chain_epoch/chain_epoch.hpp b/include/filecoin/primitives/chain_epoch/chain_epoch.hpp
similarity index 100%
rename from core/primitives/chain_epoch/chain_epoch.hpp
rename to include/filecoin/primitives/chain_epoch/chain_epoch.hpp
diff --git a/core/primitives/chain_epoch/chain_epoch_codec.hpp b/include/filecoin/primitives/chain_epoch/chain_epoch_codec.hpp
similarity index 88%
rename from core/primitives/chain_epoch/chain_epoch_codec.hpp
rename to include/filecoin/primitives/chain_epoch/chain_epoch_codec.hpp
index ccddd40e98..3d96a0eb06 100644
--- a/core/primitives/chain_epoch/chain_epoch_codec.hpp
+++ b/include/filecoin/primitives/chain_epoch/chain_epoch_codec.hpp
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "primitives/chain_epoch/chain_epoch.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch.hpp"
 
 namespace fc::primitives::chain_epoch {
   std::string uvarintKey(uint64_t value);
diff --git a/core/primitives/cid/cid.hpp b/include/filecoin/primitives/cid/cid.hpp
similarity index 97%
rename from core/primitives/cid/cid.hpp
rename to include/filecoin/primitives/cid/cid.hpp
index 5ff785298f..be9d2b8693 100644
--- a/core/primitives/cid/cid.hpp
+++ b/include/filecoin/primitives/cid/cid.hpp
@@ -8,7 +8,7 @@
 
 #include <libp2p/multi/content_identifier.hpp>
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc {
   class CID : public libp2p::multi::ContentIdentifier {
diff --git a/core/primitives/cid/cid_of_cbor.hpp b/include/filecoin/primitives/cid/cid_of_cbor.hpp
similarity index 89%
rename from core/primitives/cid/cid_of_cbor.hpp
rename to include/filecoin/primitives/cid/cid_of_cbor.hpp
index 7b26c6f2f8..bb8ffde9e1 100644
--- a/core/primitives/cid/cid_of_cbor.hpp
+++ b/include/filecoin/primitives/cid/cid_of_cbor.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_PRIMITIVES_CID_CID_OF_CBOR_HPP
 #define CPP_FILECOIN_CORE_PRIMITIVES_CID_CID_OF_CBOR_HPP
 
-#include "primitives/cid/cid.hpp"
-#include "codec/cbor/cbor.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
 
 namespace fc::primitives::cid {
 
diff --git a/core/primitives/cid/comm_cid.hpp b/include/filecoin/primitives/cid/comm_cid.hpp
similarity index 97%
rename from core/primitives/cid/comm_cid.hpp
rename to include/filecoin/primitives/cid/comm_cid.hpp
index ec1b3888b7..d89be7d73d 100644
--- a/core/primitives/cid/comm_cid.hpp
+++ b/include/filecoin/primitives/cid/comm_cid.hpp
@@ -7,8 +7,8 @@
 #define CPP_FILECOIN_COMM_CID_HPP
 
 #include <unordered_map>
-#include "common/blob.hpp"
-#include "primitives/cid/cid.hpp"
+#include "filecoin/common/blob.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
 
 namespace fc::common {
   // kCommitmentBytesLen is the number of bytes in a CommR, CommD, CommP, and
diff --git a/core/primitives/cid/comm_cid_errors.hpp b/include/filecoin/primitives/cid/comm_cid_errors.hpp
similarity index 93%
rename from core/primitives/cid/comm_cid_errors.hpp
rename to include/filecoin/primitives/cid/comm_cid_errors.hpp
index 08eb4210db..0249112929 100644
--- a/core/primitives/cid/comm_cid_errors.hpp
+++ b/include/filecoin/primitives/cid/comm_cid_errors.hpp
@@ -7,7 +7,7 @@
 #define CPP_FILECOIN_COMM_CID_ERRORS_HPP
 
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::common {
 
diff --git a/core/primitives/cid/json_codec.hpp b/include/filecoin/primitives/cid/json_codec.hpp
similarity index 87%
rename from core/primitives/cid/json_codec.hpp
rename to include/filecoin/primitives/cid/json_codec.hpp
index 8589bb5a05..b1f2b19a42 100644
--- a/core/primitives/cid/json_codec.hpp
+++ b/include/filecoin/primitives/cid/json_codec.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_CORE_PRIMITIVES_CID_JSON_CODEC_HPP
 #define CPP_FILECOIN_CORE_PRIMITIVES_CID_JSON_CODEC_HPP
 
-#include "common/outcome.hpp"
-#include "primitives/cid/cid.hpp"
-#include "common/buffer.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/common/buffer.hpp"
 
 namespace fc::codec::json {
   enum class JsonCodecError : int { BAD_JSON = 1, WRONG_CID_ARRAY_FORMAT };
diff --git a/core/primitives/piece/piece.hpp b/include/filecoin/primitives/piece/piece.hpp
similarity index 95%
rename from core/primitives/piece/piece.hpp
rename to include/filecoin/primitives/piece/piece.hpp
index 36334ab6c3..9dc1dca977 100644
--- a/core/primitives/piece/piece.hpp
+++ b/include/filecoin/primitives/piece/piece.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_PIECE_HPP
 #define CPP_FILECOIN_PIECE_HPP
 
-#include "primitives/cid/cid.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
 
 namespace fc::primitives::piece {
 
diff --git a/core/primitives/piece/piece_error.hpp b/include/filecoin/primitives/piece/piece_error.hpp
similarity index 93%
rename from core/primitives/piece/piece_error.hpp
rename to include/filecoin/primitives/piece/piece_error.hpp
index 26814132a7..6cb404a93c 100644
--- a/core/primitives/piece/piece_error.hpp
+++ b/include/filecoin/primitives/piece/piece_error.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_PIECE_ERROR_HPP
 #define CPP_FILECOIN_PIECE_ERROR_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::primitives::piece {
 
diff --git a/core/primitives/rle_bitset/rle_bitset.hpp b/include/filecoin/primitives/rle_bitset/rle_bitset.hpp
similarity index 84%
rename from core/primitives/rle_bitset/rle_bitset.hpp
rename to include/filecoin/primitives/rle_bitset/rle_bitset.hpp
index a0e709468a..e10c738a2b 100644
--- a/core/primitives/rle_bitset/rle_bitset.hpp
+++ b/include/filecoin/primitives/rle_bitset/rle_bitset.hpp
@@ -8,9 +8,9 @@
 
 #include <set>
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "codec/rle/rle_plus.hpp"
-#include "common/outcome_throw.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/codec/rle/rle_plus.hpp"
+#include "filecoin/common/outcome_throw.hpp"
 
 namespace fc::primitives {
   struct RleBitset : public std::set<uint64_t> {
diff --git a/core/primitives/sector/sector.hpp b/include/filecoin/primitives/sector/sector.hpp
similarity index 97%
rename from core/primitives/sector/sector.hpp
rename to include/filecoin/primitives/sector/sector.hpp
index a7600a26e9..8a6e040622 100644
--- a/core/primitives/sector/sector.hpp
+++ b/include/filecoin/primitives/sector/sector.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_PROOFS_SECTOR_HPP
 #define CPP_FILECOIN_CORE_PROOFS_SECTOR_HPP
 
-#include "primitives/cid/cid.hpp"
-#include "primitives/types.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/primitives/types.hpp"
 
 namespace fc::primitives::sector {
   using common::Buffer;
diff --git a/core/primitives/ticket/epost_ticket.hpp b/include/filecoin/primitives/ticket/epost_ticket.hpp
similarity index 92%
rename from core/primitives/ticket/epost_ticket.hpp
rename to include/filecoin/primitives/ticket/epost_ticket.hpp
index 4cb7aff8e7..9af1a86651 100644
--- a/core/primitives/ticket/epost_ticket.hpp
+++ b/include/filecoin/primitives/ticket/epost_ticket.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_CORE_PRIMITIVES_TICKET_EPOST_TICKET_HPP
 #define CPP_FILECOIN_CORE_PRIMITIVES_TICKET_EPOST_TICKET_HPP
 
-#include "common/blob.hpp"
-#include "common/buffer.hpp"
-#include "crypto/vrf/vrf_types.hpp"
+#include "filecoin/common/blob.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/crypto/vrf/vrf_types.hpp"
 
 namespace fc::primitives::ticket {
   /**
diff --git a/core/primitives/ticket/epost_ticket_codec.hpp b/include/filecoin/primitives/ticket/epost_ticket_codec.hpp
similarity index 91%
rename from core/primitives/ticket/epost_ticket_codec.hpp
rename to include/filecoin/primitives/ticket/epost_ticket_codec.hpp
index 2f0ac3a009..5cfb2b2379 100644
--- a/core/primitives/ticket/epost_ticket_codec.hpp
+++ b/include/filecoin/primitives/ticket/epost_ticket_codec.hpp
@@ -8,10 +8,10 @@
 
 #include <vector>
 
-#include "codec/cbor/cbor.hpp"
-#include "common/outcome.hpp"
-#include "common/outcome_throw.hpp"
-#include "primitives/ticket/epost_ticket.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/common/outcome_throw.hpp"
+#include "filecoin/primitives/ticket/epost_ticket.hpp"
 
 namespace fc::primitives::ticket {
   enum class EPoSTTicketCodecError : int {
diff --git a/core/primitives/ticket/ticket.hpp b/include/filecoin/primitives/ticket/ticket.hpp
similarity index 85%
rename from core/primitives/ticket/ticket.hpp
rename to include/filecoin/primitives/ticket/ticket.hpp
index 5a045a5aad..fe2b52bf74 100644
--- a/core/primitives/ticket/ticket.hpp
+++ b/include/filecoin/primitives/ticket/ticket.hpp
@@ -7,11 +7,11 @@
 #define CPP_FILECOIN_CORE_PRIMITIVES_TICKET_TICKET_HPP
 
 #include <libp2p/crypto/sha/sha256.hpp>
-#include "common/blob.hpp"
-#include "common/buffer.hpp"
-#include "common/outcome.hpp"
-#include "crypto/randomness/randomness_types.hpp"
-#include "crypto/vrf/vrf_types.hpp"
+#include "filecoin/common/blob.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/crypto/randomness/randomness_types.hpp"
+#include "filecoin/crypto/vrf/vrf_types.hpp"
 
 namespace fc::primitives::ticket {
 
diff --git a/core/primitives/ticket/ticket_codec.hpp b/include/filecoin/primitives/ticket/ticket_codec.hpp
similarity index 88%
rename from core/primitives/ticket/ticket_codec.hpp
rename to include/filecoin/primitives/ticket/ticket_codec.hpp
index 35e9dfddd7..91616a9425 100644
--- a/core/primitives/ticket/ticket_codec.hpp
+++ b/include/filecoin/primitives/ticket/ticket_codec.hpp
@@ -8,10 +8,10 @@
 
 #include <vector>
 
-#include "codec/cbor/cbor.hpp"
-#include "common/outcome.hpp"
-#include "common/outcome_throw.hpp"
-#include "primitives/ticket/ticket.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/common/outcome_throw.hpp"
+#include "filecoin/primitives/ticket/ticket.hpp"
 
 namespace fc::primitives::ticket {
   enum class TicketCodecError : int {
diff --git a/core/primitives/tipset/tipset.hpp b/include/filecoin/primitives/tipset/tipset.hpp
similarity index 89%
rename from core/primitives/tipset/tipset.hpp
rename to include/filecoin/primitives/tipset/tipset.hpp
index 7263e9a544..b176b7c885 100644
--- a/core/primitives/tipset/tipset.hpp
+++ b/include/filecoin/primitives/tipset/tipset.hpp
@@ -7,12 +7,12 @@
 #define CPP_FILECOIN_CORE_PRIMITIVES_TIPSET_TIPSET_HPP
 
 #include <boost/optional.hpp>
-#include "common/outcome.hpp"
-#include "common/outcome_throw.hpp"
-#include "primitives/block/block.hpp"
-#include "primitives/cid/cid.hpp"
-#include "primitives/ticket/ticket.hpp"
-#include "primitives/tipset/tipset_key.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/common/outcome_throw.hpp"
+#include "filecoin/primitives/block/block.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/primitives/ticket/ticket.hpp"
+#include "filecoin/primitives/tipset/tipset_key.hpp"
 
 namespace fc::primitives::tipset {
 
diff --git a/core/primitives/tipset/tipset_key.hpp b/include/filecoin/primitives/tipset/tipset_key.hpp
similarity index 94%
rename from core/primitives/tipset/tipset_key.hpp
rename to include/filecoin/primitives/tipset/tipset_key.hpp
index 9332f327da..83407721c1 100644
--- a/core/primitives/tipset/tipset_key.hpp
+++ b/include/filecoin/primitives/tipset/tipset_key.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_PRIMITIVES_TIPSET_TIPSET_KEY_HPP
 #define CPP_FILECOIN_CORE_PRIMITIVES_TIPSET_TIPSET_KEY_HPP
 
-#include "common/buffer.hpp"
-#include "primitives/cid/cid.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
 
 namespace fc::primitives::tipset {
   /**
diff --git a/core/primitives/types.hpp b/include/filecoin/primitives/types.hpp
similarity index 82%
rename from core/primitives/types.hpp
rename to include/filecoin/primitives/types.hpp
index ceced6d1fd..d00a89d501 100644
--- a/core/primitives/types.hpp
+++ b/include/filecoin/primitives/types.hpp
@@ -8,9 +8,9 @@
 
 #include <cstdint>
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "primitives/big_int.hpp"
-#include "primitives/chain_epoch/chain_epoch.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/primitives/big_int.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch.hpp"
 
 namespace fc::primitives {
   using ActorId = uint64_t;
diff --git a/core/proofs/proof_param_provider.hpp b/include/filecoin/proofs/proof_param_provider.hpp
similarity index 92%
rename from core/proofs/proof_param_provider.hpp
rename to include/filecoin/proofs/proof_param_provider.hpp
index 7f84b51a25..1a7b3f0631 100644
--- a/core/proofs/proof_param_provider.hpp
+++ b/include/filecoin/proofs/proof_param_provider.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_PROOF_PARAM_PROVIDER_HPP
 #define CPP_FILECOIN_PROOF_PARAM_PROVIDER_HPP
 
-#include "common/logger.hpp"
-#include "common/outcome.hpp"
+#include "filecoin/common/logger.hpp"
+#include "filecoin/common/outcome.hpp"
 #include "gsl/span"
 
 namespace fc::proofs {
diff --git a/core/proofs/proof_param_provider_error.hpp b/include/filecoin/proofs/proof_param_provider_error.hpp
similarity index 94%
rename from core/proofs/proof_param_provider_error.hpp
rename to include/filecoin/proofs/proof_param_provider_error.hpp
index cbd7d53290..905d860f33 100644
--- a/core/proofs/proof_param_provider_error.hpp
+++ b/include/filecoin/proofs/proof_param_provider_error.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_PROOFS_PROOF_PARAM_PROVIDER_ERROR_HPP
 #define FILECOIN_CORE_PROOFS_PROOF_PARAM_PROVIDER_ERROR_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::proofs {
 
diff --git a/core/proofs/proofs.hpp b/include/filecoin/proofs/proofs.hpp
similarity index 94%
rename from core/proofs/proofs.hpp
rename to include/filecoin/proofs/proofs.hpp
index 493f661800..a6d56f26e9 100644
--- a/core/proofs/proofs.hpp
+++ b/include/filecoin/proofs/proofs.hpp
@@ -7,13 +7,13 @@
 #define CPP_FILECOIN_CORE_PROOFS_HPP
 
 #include <vector>
-#include "common/blob.hpp"
-#include "common/logger.hpp"
-#include "common/outcome.hpp"
-#include "crypto/randomness/randomness_types.hpp"
-#include "primitives/cid/cid.hpp"
-#include "primitives/piece/piece.hpp"
-#include "primitives/sector/sector.hpp"
+#include "filecoin/common/blob.hpp"
+#include "filecoin/common/logger.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/crypto/randomness/randomness_types.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/primitives/piece/piece.hpp"
+#include "filecoin/primitives/sector/sector.hpp"
 
 namespace fc::proofs {
 
diff --git a/core/proofs/proofs_error.hpp b/include/filecoin/proofs/proofs_error.hpp
similarity index 93%
rename from core/proofs/proofs_error.hpp
rename to include/filecoin/proofs/proofs_error.hpp
index 67b024f3d4..dc78a213dd 100644
--- a/core/proofs/proofs_error.hpp
+++ b/include/filecoin/proofs/proofs_error.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_PROOFS_PROOFS_ERROR_HPP
 #define FILECOIN_CORE_PROOFS_PROOFS_ERROR_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::proofs {
 
diff --git a/core/storage/amt/amt.hpp b/include/filecoin/storage/amt/amt.hpp
similarity index 94%
rename from core/storage/amt/amt.hpp
rename to include/filecoin/storage/amt/amt.hpp
index 4f640ae522..7d1de521bb 100644
--- a/core/storage/amt/amt.hpp
+++ b/include/filecoin/storage/amt/amt.hpp
@@ -8,13 +8,13 @@
 
 #include <boost/variant.hpp>
 
-#include "codec/cbor/cbor.hpp"
-#include "common/outcome_throw.hpp"
-#include "common/visitor.hpp"
-#include "common/which.hpp"
-#include "primitives/cid/cid.hpp"
-#include "storage/ipfs/datastore.hpp"
-#include "storage/ipld/ipld_block_common.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/common/outcome_throw.hpp"
+#include "filecoin/common/visitor.hpp"
+#include "filecoin/common/which.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/storage/ipld/ipld_block_common.hpp"
 
 namespace fc::storage::amt {
   enum class AmtError {
diff --git a/core/storage/buffer_map.hpp b/include/filecoin/storage/buffer_map.hpp
similarity index 79%
rename from core/storage/buffer_map.hpp
rename to include/filecoin/storage/buffer_map.hpp
index 573c05b087..5a01927de2 100644
--- a/core/storage/buffer_map.hpp
+++ b/include/filecoin/storage/buffer_map.hpp
@@ -15,10 +15,10 @@
 
 #include <gsl/span>
 
-#include "common/buffer.hpp"
-#include "storage/face/generic_map.hpp"
-#include "storage/face/persistent_map.hpp"
-#include "storage/face/write_batch.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/storage/face/generic_map.hpp"
+#include "filecoin/storage/face/persistent_map.hpp"
+#include "filecoin/storage/face/write_batch.hpp"
 
 namespace fc::storage {
 
diff --git a/core/storage/chain/chain_data_store.hpp b/include/filecoin/storage/chain/chain_data_store.hpp
similarity index 95%
rename from core/storage/chain/chain_data_store.hpp
rename to include/filecoin/storage/chain/chain_data_store.hpp
index eef2ec48d3..5d8aa3a09d 100644
--- a/core/storage/chain/chain_data_store.hpp
+++ b/include/filecoin/storage/chain/chain_data_store.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_STORAGE_CHAIN_CHAIN_DATA_STORE_HPP
 #define CPP_FILECOIN_CORE_STORAGE_CHAIN_CHAIN_DATA_STORE_HPP
 
-#include "storage/chain/datastore_key.hpp"
+#include "filecoin/storage/chain/datastore_key.hpp"
 
 namespace fc::storage::blockchain {
 
diff --git a/core/storage/chain/chain_store.hpp b/include/filecoin/storage/chain/chain_store.hpp
similarity index 94%
rename from core/storage/chain/chain_store.hpp
rename to include/filecoin/storage/chain/chain_store.hpp
index a8c8191f2e..a6d321a17e 100644
--- a/core/storage/chain/chain_store.hpp
+++ b/include/filecoin/storage/chain/chain_store.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_STORAGE_CHAIN_CHAIN_STORE_HPP
 #define CPP_FILECOIN_CORE_STORAGE_CHAIN_CHAIN_STORE_HPP
 
-#include "primitives/block/block.hpp"
-#include "primitives/tipset/tipset.hpp"
+#include "filecoin/primitives/block/block.hpp"
+#include "filecoin/primitives/tipset/tipset.hpp"
 
 namespace fc::storage::blockchain {
 
diff --git a/core/storage/chain/datastore_key.hpp b/include/filecoin/storage/chain/datastore_key.hpp
similarity index 93%
rename from core/storage/chain/datastore_key.hpp
rename to include/filecoin/storage/chain/datastore_key.hpp
index 45281eca4d..5e3561ab7c 100644
--- a/core/storage/chain/datastore_key.hpp
+++ b/include/filecoin/storage/chain/datastore_key.hpp
@@ -8,8 +8,8 @@
 
 #include <string>
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "common/outcome.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::storage {
   /**
diff --git a/core/storage/chain/impl/chain_data_store_impl.hpp b/include/filecoin/storage/chain/impl/chain_data_store_impl.hpp
similarity index 89%
rename from core/storage/chain/impl/chain_data_store_impl.hpp
rename to include/filecoin/storage/chain/impl/chain_data_store_impl.hpp
index 534d5f7ca6..c520fe2ba5 100644
--- a/core/storage/chain/impl/chain_data_store_impl.hpp
+++ b/include/filecoin/storage/chain/impl/chain_data_store_impl.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_STORAGE_CHAIN_IMPL_CHAIN_DATA_STORE_IMPL_HPP
 #define CPP_FILECOIN_CORE_STORAGE_CHAIN_IMPL_CHAIN_DATA_STORE_IMPL_HPP
 
-#include "storage/chain/chain_data_store.hpp"
-#include "storage/ipfs/datastore.hpp"
+#include "filecoin/storage/chain/chain_data_store.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
 
 namespace fc::storage::blockchain {
 
diff --git a/core/storage/chain/impl/chain_store_impl.hpp b/include/filecoin/storage/chain/impl/chain_store_impl.hpp
similarity index 85%
rename from core/storage/chain/impl/chain_store_impl.hpp
rename to include/filecoin/storage/chain/impl/chain_store_impl.hpp
index d70818f27e..adbd317680 100644
--- a/core/storage/chain/impl/chain_store_impl.hpp
+++ b/include/filecoin/storage/chain/impl/chain_store_impl.hpp
@@ -8,16 +8,16 @@
 
 #include <map>
 
-#include "blockchain/block_validator.hpp"
-#include "blockchain/weight_calculator.hpp"
-#include "common/logger.hpp"
-#include "common/outcome.hpp"
-#include "crypto/randomness/chain_randomness_provider.hpp"
-#include "crypto/randomness/randomness_types.hpp"
-#include "primitives/cid/cid.hpp"
-#include "storage/chain/chain_data_store.hpp"
-#include "storage/chain/chain_store.hpp"
-#include "storage/ipfs/impl/ipfs_block_service.hpp"
+#include "filecoin/blockchain/block_validator.hpp"
+#include "filecoin/blockchain/weight_calculator.hpp"
+#include "filecoin/common/logger.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/crypto/randomness/chain_randomness_provider.hpp"
+#include "filecoin/crypto/randomness/randomness_types.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/storage/chain/chain_data_store.hpp"
+#include "filecoin/storage/chain/chain_store.hpp"
+#include "filecoin/storage/ipfs/impl/ipfs_block_service.hpp"
 
 namespace fc::storage::blockchain {
 
diff --git a/core/storage/config/config.hpp b/include/filecoin/storage/config/config.hpp
similarity index 95%
rename from core/storage/config/config.hpp
rename to include/filecoin/storage/config/config.hpp
index 85167245d3..8952aab766 100644
--- a/core/storage/config/config.hpp
+++ b/include/filecoin/storage/config/config.hpp
@@ -9,8 +9,8 @@
 #include <boost/property_tree/ptree.hpp>
 #include <string>
 
-#include "common/outcome.hpp"
-#include "storage/config/config_error.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/config/config_error.hpp"
 
 namespace fc::storage::config {
 
diff --git a/core/storage/config/config_error.hpp b/include/filecoin/storage/config/config_error.hpp
similarity index 93%
rename from core/storage/config/config_error.hpp
rename to include/filecoin/storage/config/config_error.hpp
index 9f831e8989..17dc90a14f 100644
--- a/core/storage/config/config_error.hpp
+++ b/include/filecoin/storage/config/config_error.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_STORAGE_CONFIG_ERROR_HPP
 #define FILECOIN_CORE_STORAGE_CONFIG_ERROR_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::storage::config {
 
diff --git a/core/storage/config/config_validator.hpp b/include/filecoin/storage/config/config_validator.hpp
similarity index 87%
rename from core/storage/config/config_validator.hpp
rename to include/filecoin/storage/config/config_validator.hpp
index e37a235f90..aa87b9f97a 100644
--- a/core/storage/config/config_validator.hpp
+++ b/include/filecoin/storage/config/config_validator.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_STORAGE_CONFIG_VALIDATOR_HPP
 #define CPP_FILECOIN_CORE_STORAGE_CONFIG_VALIDATOR_HPP
 
-#include "common/outcome.hpp"
-#include "storage/config/config.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/config/config.hpp"
 
 namespace fc::storage::config {
 
diff --git a/core/storage/face/generic_iterator.hpp b/include/filecoin/storage/face/generic_iterator.hpp
similarity index 100%
rename from core/storage/face/generic_iterator.hpp
rename to include/filecoin/storage/face/generic_iterator.hpp
diff --git a/core/storage/face/generic_list.hpp b/include/filecoin/storage/face/generic_list.hpp
similarity index 98%
rename from core/storage/face/generic_list.hpp
rename to include/filecoin/storage/face/generic_list.hpp
index bac19dec13..49c27d920f 100644
--- a/core/storage/face/generic_list.hpp
+++ b/include/filecoin/storage/face/generic_list.hpp
@@ -9,7 +9,7 @@
 #include <cstddef>
 #include <memory>
 
-#include "storage/face/generic_iterator.hpp"
+#include "filecoin/storage/face/generic_iterator.hpp"
 
 namespace fc::face {
 
diff --git a/core/storage/face/generic_map.hpp b/include/filecoin/storage/face/generic_map.hpp
similarity index 80%
rename from core/storage/face/generic_map.hpp
rename to include/filecoin/storage/face/generic_map.hpp
index c8ff1cbf50..8a340cc361 100644
--- a/core/storage/face/generic_map.hpp
+++ b/include/filecoin/storage/face/generic_map.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_GENERIC_MAP_HPP
 #define CPP_FILECOIN_GENERIC_MAP_HPP
 
-#include "storage/face/iterable_map.hpp"
-#include "storage/face/readable_map.hpp"
-#include "storage/face/writeable_map.hpp"
+#include "filecoin/storage/face/iterable_map.hpp"
+#include "filecoin/storage/face/readable_map.hpp"
+#include "filecoin/storage/face/writeable_map.hpp"
 
 namespace fc::storage::face {
 
diff --git a/core/storage/face/iterable_map.hpp b/include/filecoin/storage/face/iterable_map.hpp
similarity index 93%
rename from core/storage/face/iterable_map.hpp
rename to include/filecoin/storage/face/iterable_map.hpp
index 9a64648f22..c61df6cf9f 100644
--- a/core/storage/face/iterable_map.hpp
+++ b/include/filecoin/storage/face/iterable_map.hpp
@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include "storage/face/map_cursor.hpp"
+#include "filecoin/storage/face/map_cursor.hpp"
 
 namespace fc::storage::face {
 
diff --git a/core/storage/face/map_cursor.hpp b/include/filecoin/storage/face/map_cursor.hpp
similarity index 100%
rename from core/storage/face/map_cursor.hpp
rename to include/filecoin/storage/face/map_cursor.hpp
diff --git a/core/storage/face/persistent_map.hpp b/include/filecoin/storage/face/persistent_map.hpp
similarity index 88%
rename from core/storage/face/persistent_map.hpp
rename to include/filecoin/storage/face/persistent_map.hpp
index 6243197adb..87a4faf1b8 100644
--- a/core/storage/face/persistent_map.hpp
+++ b/include/filecoin/storage/face/persistent_map.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_PERSISTENT_MAP_HPP
 #define CPP_FILECOIN_PERSISTENT_MAP_HPP
 
-#include "storage/face/generic_map.hpp"
-#include "storage/face/write_batch.hpp"
+#include "filecoin/storage/face/generic_map.hpp"
+#include "filecoin/storage/face/write_batch.hpp"
 
 namespace fc::storage::face {
 
diff --git a/core/storage/face/readable_map.hpp b/include/filecoin/storage/face/readable_map.hpp
similarity index 90%
rename from core/storage/face/readable_map.hpp
rename to include/filecoin/storage/face/readable_map.hpp
index 0fe5b167fd..3752ea8f6e 100644
--- a/core/storage/face/readable_map.hpp
+++ b/include/filecoin/storage/face/readable_map.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_READABLE_MAP_HPP
 #define CPP_FILECOIN_READABLE_MAP_HPP
 
-#include "common/outcome.hpp"
-#include "storage/face/map_cursor.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/face/map_cursor.hpp"
 
 namespace fc::storage::face {
 
diff --git a/core/storage/face/write_batch.hpp b/include/filecoin/storage/face/write_batch.hpp
similarity index 93%
rename from core/storage/face/write_batch.hpp
rename to include/filecoin/storage/face/write_batch.hpp
index 9cfade1ae5..233df90167 100644
--- a/core/storage/face/write_batch.hpp
+++ b/include/filecoin/storage/face/write_batch.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_WRITE_BATCH_HPP
 #define CPP_FILECOIN_WRITE_BATCH_HPP
 
-#include "storage/face/writeable_map.hpp"
+#include "filecoin/storage/face/writeable_map.hpp"
 
 namespace fc::storage::face {
 
diff --git a/core/storage/face/writeable_map.hpp b/include/filecoin/storage/face/writeable_map.hpp
similarity index 96%
rename from core/storage/face/writeable_map.hpp
rename to include/filecoin/storage/face/writeable_map.hpp
index f838603d2e..627c512af1 100644
--- a/core/storage/face/writeable_map.hpp
+++ b/include/filecoin/storage/face/writeable_map.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_WRITEABLE_MAP_HPP
 #define CPP_FILECOIN_WRITEABLE_MAP_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::storage::face {
 
diff --git a/core/storage/filestore/file.hpp b/include/filecoin/storage/filestore/file.hpp
similarity index 95%
rename from core/storage/filestore/file.hpp
rename to include/filecoin/storage/filestore/file.hpp
index 8b452575b4..e39f5a48d1 100644
--- a/core/storage/filestore/file.hpp
+++ b/include/filecoin/storage/filestore/file.hpp
@@ -8,8 +8,8 @@
 
 #include <gsl/span>
 
-#include "common/outcome.hpp"
-#include "storage/filestore/path.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/filestore/path.hpp"
 
 namespace fc::storage::filestore {
 
diff --git a/core/storage/filestore/filestore.hpp b/include/filecoin/storage/filestore/filestore.hpp
similarity index 92%
rename from core/storage/filestore/filestore.hpp
rename to include/filecoin/storage/filestore/filestore.hpp
index f0b96f8808..84dcf17703 100644
--- a/core/storage/filestore/filestore.hpp
+++ b/include/filecoin/storage/filestore/filestore.hpp
@@ -10,9 +10,9 @@
 #include <string>
 #include <vector>
 
-#include "common/outcome.hpp"
-#include "storage/filestore/file.hpp"
-#include "storage/filestore/path.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/filestore/file.hpp"
+#include "filecoin/storage/filestore/path.hpp"
 
 namespace fc::storage::filestore {
 
diff --git a/core/storage/filestore/filestore_error.hpp b/include/filecoin/storage/filestore/filestore_error.hpp
similarity index 94%
rename from core/storage/filestore/filestore_error.hpp
rename to include/filecoin/storage/filestore/filestore_error.hpp
index 94dd72360a..64c108b375 100644
--- a/core/storage/filestore/filestore_error.hpp
+++ b/include/filecoin/storage/filestore/filestore_error.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_STORAGE_FILESTORE_FILESTORE_ERROR_HPP
 #define FILECOIN_CORE_STORAGE_FILESTORE_FILESTORE_ERROR_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::storage::filestore {
 
diff --git a/core/storage/filestore/impl/filesystem/filesystem_file.hpp b/include/filecoin/storage/filestore/impl/filesystem/filesystem_file.hpp
similarity index 96%
rename from core/storage/filestore/impl/filesystem/filesystem_file.hpp
rename to include/filecoin/storage/filestore/impl/filesystem/filesystem_file.hpp
index e4339cb7c7..185bd20545 100644
--- a/core/storage/filestore/impl/filesystem/filesystem_file.hpp
+++ b/include/filecoin/storage/filestore/impl/filesystem/filesystem_file.hpp
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "boost/filesystem.hpp"
-#include "storage/filestore/file.hpp"
+#include "filecoin/storage/filestore/file.hpp"
 
 namespace fc::storage::filestore {
 
diff --git a/core/storage/filestore/impl/filesystem/filesystem_filestore.hpp b/include/filecoin/storage/filestore/impl/filesystem/filesystem_filestore.hpp
similarity index 95%
rename from core/storage/filestore/impl/filesystem/filesystem_filestore.hpp
rename to include/filecoin/storage/filestore/impl/filesystem/filesystem_filestore.hpp
index f24794c196..23c5eb070c 100644
--- a/core/storage/filestore/impl/filesystem/filesystem_filestore.hpp
+++ b/include/filecoin/storage/filestore/impl/filesystem/filesystem_filestore.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_STORAGE_FILESTORE_FILESYSTEM_FILESTORE_HPP
 #define FILECOIN_CORE_STORAGE_FILESTORE_FILESYSTEM_FILESTORE_HPP
 
-#include "storage/filestore/filestore.hpp"
+#include "filecoin/storage/filestore/filestore.hpp"
 
 namespace fc::storage::filestore {
 
diff --git a/core/storage/filestore/path.hpp b/include/filecoin/storage/filestore/path.hpp
similarity index 100%
rename from core/storage/filestore/path.hpp
rename to include/filecoin/storage/filestore/path.hpp
diff --git a/core/storage/hamt/hamt.hpp b/include/filecoin/storage/hamt/hamt.hpp
similarity index 95%
rename from core/storage/hamt/hamt.hpp
rename to include/filecoin/storage/hamt/hamt.hpp
index 1a2cf05344..0312d351a5 100644
--- a/core/storage/hamt/hamt.hpp
+++ b/include/filecoin/storage/hamt/hamt.hpp
@@ -12,12 +12,12 @@
 #include <boost/multiprecision/cpp_int.hpp>
 #include <boost/variant.hpp>
 
-#include "codec/cbor/cbor.hpp"
-#include "codec/cbor/streams_annotation.hpp"
-#include "common/outcome_throw.hpp"
-#include "common/visitor.hpp"
-#include "primitives/cid/cid.hpp"
-#include "storage/ipfs/datastore.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/common/outcome_throw.hpp"
+#include "filecoin/common/visitor.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
 
 namespace fc::storage::hamt {
   enum class HamtError { EXPECTED_CID = 1, NOT_FOUND, MAX_DEPTH };
diff --git a/core/storage/in_memory/in_memory_batch.hpp b/include/filecoin/storage/in_memory/in_memory_batch.hpp
similarity index 93%
rename from core/storage/in_memory/in_memory_batch.hpp
rename to include/filecoin/storage/in_memory/in_memory_batch.hpp
index df35e1df3c..6c8582e59a 100644
--- a/core/storage/in_memory/in_memory_batch.hpp
+++ b/include/filecoin/storage/in_memory/in_memory_batch.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_IN_MEMORY_BATCH_HPP
 #define CPP_FILECOIN_IN_MEMORY_BATCH_HPP
 
-#include "common/buffer.hpp"
-#include "storage/in_memory/in_memory_storage.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/storage/in_memory/in_memory_storage.hpp"
 
 namespace fc::storage {
   using fc::common::Buffer;
diff --git a/core/storage/in_memory/in_memory_storage.hpp b/include/filecoin/storage/in_memory/in_memory_storage.hpp
similarity index 91%
rename from core/storage/in_memory/in_memory_storage.hpp
rename to include/filecoin/storage/in_memory/in_memory_storage.hpp
index 80b420a855..46180f5715 100644
--- a/core/storage/in_memory/in_memory_storage.hpp
+++ b/include/filecoin/storage/in_memory/in_memory_storage.hpp
@@ -8,9 +8,9 @@
 
 #include <memory>
 
-#include "common/outcome.hpp"
-#include "common/buffer.hpp"
-#include "storage/face/persistent_map.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/storage/face/persistent_map.hpp"
 
 namespace fc::storage {
 
diff --git a/core/storage/ipfs/datastore.hpp b/include/filecoin/storage/ipfs/datastore.hpp
similarity index 88%
rename from core/storage/ipfs/datastore.hpp
rename to include/filecoin/storage/ipfs/datastore.hpp
index 83b784c257..42b8caace1 100644
--- a/core/storage/ipfs/datastore.hpp
+++ b/include/filecoin/storage/ipfs/datastore.hpp
@@ -8,12 +8,12 @@
 
 #include <vector>
 
-#include "codec/cbor/cbor.hpp"
-#include "common/buffer.hpp"
-#include "common/logger.hpp"
-#include "common/outcome.hpp"
-#include "primitives/cid/cid.hpp"
-#include "storage/ipfs/ipfs_datastore_error.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/common/logger.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/storage/ipfs/ipfs_datastore_error.hpp"
 
 namespace fc::storage::ipfs {
 
diff --git a/core/storage/ipfs/impl/datastore_leveldb.hpp b/include/filecoin/storage/ipfs/impl/datastore_leveldb.hpp
similarity index 91%
rename from core/storage/ipfs/impl/datastore_leveldb.hpp
rename to include/filecoin/storage/ipfs/impl/datastore_leveldb.hpp
index eefcb3a166..f10ae75eff 100644
--- a/core/storage/ipfs/impl/datastore_leveldb.hpp
+++ b/include/filecoin/storage/ipfs/impl/datastore_leveldb.hpp
@@ -8,9 +8,9 @@
 
 #include <memory>
 
-#include "common/outcome.hpp"
-#include "storage/ipfs/datastore.hpp"
-#include "storage/leveldb/leveldb.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/storage/leveldb/leveldb.hpp"
 
 namespace fc::storage::ipfs {
 
diff --git a/core/storage/ipfs/impl/in_memory_datastore.hpp b/include/filecoin/storage/ipfs/impl/in_memory_datastore.hpp
similarity index 95%
rename from core/storage/ipfs/impl/in_memory_datastore.hpp
rename to include/filecoin/storage/ipfs/impl/in_memory_datastore.hpp
index 9fb9229360..29062d1864 100644
--- a/core/storage/ipfs/impl/in_memory_datastore.hpp
+++ b/include/filecoin/storage/ipfs/impl/in_memory_datastore.hpp
@@ -8,7 +8,7 @@
 
 #include <map>
 
-#include "storage/ipfs/datastore.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
 
 namespace fc::storage::ipfs {
 
diff --git a/core/storage/ipfs/impl/ipfs_block_service.hpp b/include/filecoin/storage/ipfs/impl/ipfs_block_service.hpp
similarity index 95%
rename from core/storage/ipfs/impl/ipfs_block_service.hpp
rename to include/filecoin/storage/ipfs/impl/ipfs_block_service.hpp
index 77a9ca8b12..0d267c98bf 100644
--- a/core/storage/ipfs/impl/ipfs_block_service.hpp
+++ b/include/filecoin/storage/ipfs/impl/ipfs_block_service.hpp
@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include "storage/ipfs/datastore.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
 
 namespace fc::storage::ipfs {
   class IpfsBlockService : public IpfsDatastore {
diff --git a/core/storage/ipfs/ipfs_datastore_error.hpp b/include/filecoin/storage/ipfs/ipfs_datastore_error.hpp
similarity index 93%
rename from core/storage/ipfs/ipfs_datastore_error.hpp
rename to include/filecoin/storage/ipfs/ipfs_datastore_error.hpp
index 6d3e21bd3c..df79288b40 100644
--- a/core/storage/ipfs/ipfs_datastore_error.hpp
+++ b/include/filecoin/storage/ipfs/ipfs_datastore_error.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_STORAGE_IPFS_DATASTORE_ERROR_HPP
 #define CPP_FILECOIN_CORE_STORAGE_IPFS_DATASTORE_ERROR_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::storage::ipfs {
 
diff --git a/core/storage/ipfs/merkledag/impl/leaf_impl.hpp b/include/filecoin/storage/ipfs/merkledag/impl/leaf_impl.hpp
similarity index 95%
rename from core/storage/ipfs/merkledag/impl/leaf_impl.hpp
rename to include/filecoin/storage/ipfs/merkledag/impl/leaf_impl.hpp
index f948b4c2e3..a61abd2e36 100644
--- a/core/storage/ipfs/merkledag/impl/leaf_impl.hpp
+++ b/include/filecoin/storage/ipfs/merkledag/impl/leaf_impl.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_STORAGE_IPFS_MERKLEDAG_LEAF_IMPL_HPP
 #define FILECOIN_STORAGE_IPFS_MERKLEDAG_LEAF_IMPL_HPP
 
-#include "storage/ipfs/merkledag/leaf.hpp"
+#include "filecoin/storage/ipfs/merkledag/leaf.hpp"
 
 #include <map>
 #include <string>
diff --git a/core/storage/ipfs/merkledag/impl/merkledag_service_impl.hpp b/include/filecoin/storage/ipfs/merkledag/impl/merkledag_service_impl.hpp
similarity index 90%
rename from core/storage/ipfs/merkledag/impl/merkledag_service_impl.hpp
rename to include/filecoin/storage/ipfs/merkledag/impl/merkledag_service_impl.hpp
index 30b0c65a3c..7425f41057 100644
--- a/core/storage/ipfs/merkledag/impl/merkledag_service_impl.hpp
+++ b/include/filecoin/storage/ipfs/merkledag/impl/merkledag_service_impl.hpp
@@ -8,10 +8,10 @@
 
 #include <memory>
 
-#include "storage/ipfs/datastore.hpp"
-#include "storage/ipfs/merkledag/impl/leaf_impl.hpp"
-#include "storage/ipfs/merkledag/merkledag_service.hpp"
-#include "storage/ipld/ipld_link.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/storage/ipfs/merkledag/impl/leaf_impl.hpp"
+#include "filecoin/storage/ipfs/merkledag/merkledag_service.hpp"
+#include "filecoin/storage/ipld/ipld_link.hpp"
 
 namespace fc::storage::ipfs::merkledag {
   using ipld::IPLDLink;
diff --git a/core/storage/ipfs/merkledag/leaf.hpp b/include/filecoin/storage/ipfs/merkledag/leaf.hpp
similarity index 94%
rename from core/storage/ipfs/merkledag/leaf.hpp
rename to include/filecoin/storage/ipfs/merkledag/leaf.hpp
index 45f45b173b..2316d2da6f 100644
--- a/core/storage/ipfs/merkledag/leaf.hpp
+++ b/include/filecoin/storage/ipfs/merkledag/leaf.hpp
@@ -9,8 +9,8 @@
 #include <functional>
 #include <string_view>
 
-#include "common/buffer.hpp"
-#include "common/outcome.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::storage::ipfs::merkledag {
   class Leaf {
diff --git a/core/storage/ipfs/merkledag/merkledag_service.hpp b/include/filecoin/storage/ipfs/merkledag/merkledag_service.hpp
similarity index 94%
rename from core/storage/ipfs/merkledag/merkledag_service.hpp
rename to include/filecoin/storage/ipfs/merkledag/merkledag_service.hpp
index 2d89dd6da4..0be27ae8be 100644
--- a/core/storage/ipfs/merkledag/merkledag_service.hpp
+++ b/include/filecoin/storage/ipfs/merkledag/merkledag_service.hpp
@@ -8,9 +8,9 @@
 
 #include <memory>
 
-#include "common/outcome.hpp"
-#include "storage/ipfs/merkledag/leaf.hpp"
-#include "storage/ipld/ipld_node.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/ipfs/merkledag/leaf.hpp"
+#include "filecoin/storage/ipld/ipld_node.hpp"
 
 namespace fc::storage::ipfs::merkledag {
   using ipld::IPLDNode;
diff --git a/core/storage/ipld/impl/ipld_link_impl.hpp b/include/filecoin/storage/ipld/impl/ipld_link_impl.hpp
similarity index 95%
rename from core/storage/ipld/impl/ipld_link_impl.hpp
rename to include/filecoin/storage/ipld/impl/ipld_link_impl.hpp
index 345f613f99..f5a7628862 100644
--- a/core/storage/ipld/impl/ipld_link_impl.hpp
+++ b/include/filecoin/storage/ipld/impl/ipld_link_impl.hpp
@@ -10,7 +10,7 @@
 #include <utility>
 #include <vector>
 
-#include "storage/ipld/ipld_link.hpp"
+#include "filecoin/storage/ipld/ipld_link.hpp"
 
 namespace fc::storage::ipld {
   class IPLDLinkImpl : public IPLDLink {
diff --git a/core/storage/ipld/impl/ipld_node_decoder_pb.hpp b/include/filecoin/storage/ipld/impl/ipld_node_decoder_pb.hpp
similarity index 95%
rename from core/storage/ipld/impl/ipld_node_decoder_pb.hpp
rename to include/filecoin/storage/ipld/impl/ipld_node_decoder_pb.hpp
index 4577782ce1..11a5106f76 100644
--- a/core/storage/ipld/impl/ipld_node_decoder_pb.hpp
+++ b/include/filecoin/storage/ipld/impl/ipld_node_decoder_pb.hpp
@@ -9,8 +9,8 @@
 #include <string>
 
 #include <gsl/span>
-#include "common/buffer.hpp"
-#include "common/outcome.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/common/outcome.hpp"
 #include "ipld_node.pb.h" //TODO: Sergey Kaprovich FIL-150
 
 namespace fc::storage::ipld {
diff --git a/core/storage/ipld/impl/ipld_node_encoder_pb.hpp b/include/filecoin/storage/ipld/impl/ipld_node_encoder_pb.hpp
similarity index 93%
rename from core/storage/ipld/impl/ipld_node_encoder_pb.hpp
rename to include/filecoin/storage/ipld/impl/ipld_node_encoder_pb.hpp
index 9a85419018..3aa15d74d9 100644
--- a/core/storage/ipld/impl/ipld_node_encoder_pb.hpp
+++ b/include/filecoin/storage/ipld/impl/ipld_node_encoder_pb.hpp
@@ -11,10 +11,10 @@
 #include <string>
 
 #include <gsl/span>
-#include "common/buffer.hpp"
-#include "common/outcome.hpp"
-#include "storage/ipld/impl/ipld_link_impl.hpp"
-#include "storage/ipld/ipld_node.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/ipld/impl/ipld_link_impl.hpp"
+#include "filecoin/storage/ipld/ipld_node.hpp"
 
 namespace fc::storage::ipld {
   /**
diff --git a/core/storage/ipld/impl/ipld_node_impl.hpp b/include/filecoin/storage/ipld/impl/ipld_node_impl.hpp
similarity index 87%
rename from core/storage/ipld/impl/ipld_node_impl.hpp
rename to include/filecoin/storage/ipld/impl/ipld_node_impl.hpp
index d76c841f29..8404bc155c 100644
--- a/core/storage/ipld/impl/ipld_node_impl.hpp
+++ b/include/filecoin/storage/ipld/impl/ipld_node_impl.hpp
@@ -12,10 +12,10 @@
 #include <vector>
 
 #include <boost/optional.hpp>
-#include "storage/ipld/impl/ipld_link_impl.hpp"
-#include "storage/ipld/impl/ipld_node_encoder_pb.hpp"
-#include "storage/ipld/ipld_block_common.hpp"
-#include "storage/ipld/ipld_node.hpp"
+#include "filecoin/storage/ipld/impl/ipld_link_impl.hpp"
+#include "filecoin/storage/ipld/impl/ipld_node_encoder_pb.hpp"
+#include "filecoin/storage/ipld/ipld_block_common.hpp"
+#include "filecoin/storage/ipld/ipld_node.hpp"
 
 namespace fc::storage::ipld {
   class IPLDNodeImpl : public IPLDNode,
diff --git a/core/storage/ipld/ipld_block.hpp b/include/filecoin/storage/ipld/ipld_block.hpp
similarity index 90%
rename from core/storage/ipld/ipld_block.hpp
rename to include/filecoin/storage/ipld/ipld_block.hpp
index 7e7926e470..3f5dc9e6df 100644
--- a/core/storage/ipld/ipld_block.hpp
+++ b/include/filecoin/storage/ipld/ipld_block.hpp
@@ -8,8 +8,8 @@
 
 #include <vector>
 
-#include "common/buffer.hpp"
-#include "primitives/cid/cid.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
 
 namespace fc::storage::ipld {
   /**
diff --git a/core/storage/ipld/ipld_block_common.hpp b/include/filecoin/storage/ipld/ipld_block_common.hpp
similarity index 90%
rename from core/storage/ipld/ipld_block_common.hpp
rename to include/filecoin/storage/ipld/ipld_block_common.hpp
index 02168a1063..f98654e055 100644
--- a/core/storage/ipld/ipld_block_common.hpp
+++ b/include/filecoin/storage/ipld/ipld_block_common.hpp
@@ -12,10 +12,10 @@
 #include <boost/optional.hpp>
 #include <libp2p/multi/hash_type.hpp>
 #include <libp2p/multi/multicodec_type.hpp>
-#include "common/buffer.hpp"
-#include "crypto/hasher/hasher.hpp"
-#include "primitives/cid/cid.hpp"
-#include "storage/ipld/ipld_block.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/crypto/hasher/hasher.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/storage/ipld/ipld_block.hpp"
 
 namespace fc::storage::ipld {
 
diff --git a/core/storage/ipld/ipld_link.hpp b/include/filecoin/storage/ipld/ipld_link.hpp
similarity index 95%
rename from core/storage/ipld/ipld_link.hpp
rename to include/filecoin/storage/ipld/ipld_link.hpp
index 3442266e1f..51e3df7861 100644
--- a/core/storage/ipld/ipld_link.hpp
+++ b/include/filecoin/storage/ipld/ipld_link.hpp
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "primitives/cid/cid.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
 
 namespace fc::storage::ipld {
   class IPLDLink {
diff --git a/core/storage/ipld/ipld_node.hpp b/include/filecoin/storage/ipld/ipld_node.hpp
similarity index 92%
rename from core/storage/ipld/ipld_node.hpp
rename to include/filecoin/storage/ipld/ipld_node.hpp
index 0b2f717504..d488c8ccd5 100644
--- a/core/storage/ipld/ipld_node.hpp
+++ b/include/filecoin/storage/ipld/ipld_node.hpp
@@ -11,10 +11,10 @@
 #include <string>
 #include <vector>
 
-#include "common/buffer.hpp"
-#include "common/outcome.hpp"
-#include "storage/ipld/ipld_block.hpp"
-#include "storage/ipld/ipld_link.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/ipld/ipld_block.hpp"
+#include "filecoin/storage/ipld/ipld_link.hpp"
 
 namespace fc::storage::ipld {
   /**
diff --git a/core/storage/keystore/impl/filesystem/filesystem_keystore.hpp b/include/filecoin/storage/keystore/impl/filesystem/filesystem_keystore.hpp
similarity index 92%
rename from core/storage/keystore/impl/filesystem/filesystem_keystore.hpp
rename to include/filecoin/storage/keystore/impl/filesystem/filesystem_keystore.hpp
index 749866412d..1bc41c479d 100644
--- a/core/storage/keystore/impl/filesystem/filesystem_keystore.hpp
+++ b/include/filecoin/storage/keystore/impl/filesystem/filesystem_keystore.hpp
@@ -6,9 +6,9 @@
 #ifndef FILECOIN_CORE_STORAGE_FILESYSTEM_KEYSTORE_HPP
 #define FILECOIN_CORE_STORAGE_FILESYSTEM_KEYSTORE_HPP
 
-#include "storage/filestore/filestore.hpp"
-#include "storage/filestore/path.hpp"
-#include "storage/keystore/keystore.hpp"
+#include "filecoin/storage/filestore/filestore.hpp"
+#include "filecoin/storage/filestore/path.hpp"
+#include "filecoin/storage/keystore/keystore.hpp"
 
 namespace fc::storage::keystore {
 
diff --git a/core/storage/keystore/impl/in_memory/in_memory_keystore.hpp b/include/filecoin/storage/keystore/impl/in_memory/in_memory_keystore.hpp
similarity index 96%
rename from core/storage/keystore/impl/in_memory/in_memory_keystore.hpp
rename to include/filecoin/storage/keystore/impl/in_memory/in_memory_keystore.hpp
index d360965311..a35285c7fa 100644
--- a/core/storage/keystore/impl/in_memory/in_memory_keystore.hpp
+++ b/include/filecoin/storage/keystore/impl/in_memory/in_memory_keystore.hpp
@@ -8,7 +8,7 @@
 
 #include <map>
 
-#include "storage/keystore/keystore.hpp"
+#include "filecoin/storage/keystore/keystore.hpp"
 
 namespace fc::storage::keystore {
 
diff --git a/core/storage/keystore/keystore.hpp b/include/filecoin/storage/keystore/keystore.hpp
similarity index 90%
rename from core/storage/keystore/keystore.hpp
rename to include/filecoin/storage/keystore/keystore.hpp
index bb0d75b3c2..30f56f31bd 100644
--- a/core/storage/keystore/keystore.hpp
+++ b/include/filecoin/storage/keystore/keystore.hpp
@@ -9,13 +9,13 @@
 #include <gsl/span>
 
 #include <boost/variant.hpp>
-#include "common/outcome.hpp"
-#include "crypto/bls/bls_provider.hpp"
-#include "crypto/bls/bls_types.hpp"
-#include "crypto/secp256k1/secp256k1_provider.hpp"
-#include "crypto/signature/signature.hpp"
-#include "primitives/address/address.hpp"
-#include "storage/keystore/keystore_error.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/crypto/bls/bls_provider.hpp"
+#include "filecoin/crypto/bls/bls_types.hpp"
+#include "filecoin/crypto/secp256k1/secp256k1_provider.hpp"
+#include "filecoin/crypto/signature/signature.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/storage/keystore/keystore_error.hpp"
 
 namespace fc::storage::keystore {
 
diff --git a/core/storage/keystore/keystore_error.hpp b/include/filecoin/storage/keystore/keystore_error.hpp
similarity index 94%
rename from core/storage/keystore/keystore_error.hpp
rename to include/filecoin/storage/keystore/keystore_error.hpp
index dc61909ca4..952e6ed793 100644
--- a/core/storage/keystore/keystore_error.hpp
+++ b/include/filecoin/storage/keystore/keystore_error.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_STORAGE_KEYSTORE_ERROR_HPP
 #define FILECOIN_CORE_STORAGE_KEYSTORE_ERROR_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::storage::keystore {
 
diff --git a/core/storage/leveldb/leveldb.hpp b/include/filecoin/storage/leveldb/leveldb.hpp
similarity index 96%
rename from core/storage/leveldb/leveldb.hpp
rename to include/filecoin/storage/leveldb/leveldb.hpp
index cae70b5f81..f5bc06bb81 100644
--- a/core/storage/leveldb/leveldb.hpp
+++ b/include/filecoin/storage/leveldb/leveldb.hpp
@@ -8,8 +8,8 @@
 
 #include <leveldb/db.h>
 #include <leveldb/write_batch.h>
-#include "common/logger.hpp"
-#include "storage/buffer_map.hpp"
+#include "filecoin/common/logger.hpp"
+#include "filecoin/storage/buffer_map.hpp"
 
 namespace fc::storage {
 
diff --git a/core/storage/leveldb/leveldb_batch.hpp b/include/filecoin/storage/leveldb/leveldb_batch.hpp
similarity index 94%
rename from core/storage/leveldb/leveldb_batch.hpp
rename to include/filecoin/storage/leveldb/leveldb_batch.hpp
index e0140f1067..047901eddb 100644
--- a/core/storage/leveldb/leveldb_batch.hpp
+++ b/include/filecoin/storage/leveldb/leveldb_batch.hpp
@@ -7,7 +7,7 @@
 #define CPP_FILECOIN_LEVELDB_BATCH_HPP
 
 #include <leveldb/write_batch.h>
-#include "storage/leveldb/leveldb.hpp"
+#include "filecoin/storage/leveldb/leveldb.hpp"
 
 namespace fc::storage {
 
diff --git a/core/storage/leveldb/leveldb_cursor.hpp b/include/filecoin/storage/leveldb/leveldb_cursor.hpp
similarity index 95%
rename from core/storage/leveldb/leveldb_cursor.hpp
rename to include/filecoin/storage/leveldb/leveldb_cursor.hpp
index 325c3640f8..e9a90f5bc3 100644
--- a/core/storage/leveldb/leveldb_cursor.hpp
+++ b/include/filecoin/storage/leveldb/leveldb_cursor.hpp
@@ -7,7 +7,7 @@
 #define CPP_FILECOIN_LEVELDB_CURSOR_HPP
 
 #include <leveldb/iterator.h>
-#include "storage/leveldb/leveldb.hpp"
+#include "filecoin/storage/leveldb/leveldb.hpp"
 
 namespace fc::storage {
 
diff --git a/core/storage/leveldb/leveldb_error.hpp b/include/filecoin/storage/leveldb/leveldb_error.hpp
similarity index 94%
rename from core/storage/leveldb/leveldb_error.hpp
rename to include/filecoin/storage/leveldb/leveldb_error.hpp
index 1ec7dbf373..9e4b1e2d6d 100644
--- a/core/storage/leveldb/leveldb_error.hpp
+++ b/include/filecoin/storage/leveldb/leveldb_error.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_LEVELDB_ERROR_HPP
 #define CPP_FILECOIN_LEVELDB_ERROR_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::storage {
 
diff --git a/core/storage/leveldb/leveldb_util.hpp b/include/filecoin/storage/leveldb/leveldb_util.hpp
similarity index 91%
rename from core/storage/leveldb/leveldb_util.hpp
rename to include/filecoin/storage/leveldb/leveldb_util.hpp
index b8ec1c1f49..7222dd9406 100644
--- a/core/storage/leveldb/leveldb_util.hpp
+++ b/include/filecoin/storage/leveldb/leveldb_util.hpp
@@ -8,10 +8,10 @@
 
 #include <leveldb/status.h>
 #include <gsl/span>
-#include "common/outcome.hpp"
-#include "common/buffer.hpp"
-#include "common/logger.hpp"
-#include "storage/leveldb/leveldb_error.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/common/logger.hpp"
+#include "filecoin/storage/leveldb/leveldb_error.hpp"
 
 namespace fc::storage {
 
diff --git a/core/storage/repository/impl/filesystem_repository.hpp b/include/filecoin/storage/repository/impl/filesystem_repository.hpp
similarity index 93%
rename from core/storage/repository/impl/filesystem_repository.hpp
rename to include/filecoin/storage/repository/impl/filesystem_repository.hpp
index 8b4c2a8df6..182750b20c 100644
--- a/core/storage/repository/impl/filesystem_repository.hpp
+++ b/include/filecoin/storage/repository/impl/filesystem_repository.hpp
@@ -8,10 +8,10 @@
 
 #include <iostream>
 
-#include "fslock/fslock.hpp"
-#include "storage/filestore/path.hpp"
-#include "storage/leveldb/leveldb.hpp"
-#include "storage/repository/repository.hpp"
+#include "filecoin/fslock/fslock.hpp"
+#include "filecoin/storage/filestore/path.hpp"
+#include "filecoin/storage/leveldb/leveldb.hpp"
+#include "filecoin/storage/repository/repository.hpp"
 
 namespace fc::storage::repository {
 
diff --git a/core/storage/repository/impl/in_memory_repository.hpp b/include/filecoin/storage/repository/impl/in_memory_repository.hpp
similarity index 94%
rename from core/storage/repository/impl/in_memory_repository.hpp
rename to include/filecoin/storage/repository/impl/in_memory_repository.hpp
index b3cc3716ff..2ec3b22acc 100644
--- a/core/storage/repository/impl/in_memory_repository.hpp
+++ b/include/filecoin/storage/repository/impl/in_memory_repository.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_STORAGE_IMPL_IN_MEMORY_REPOSITORY_HPP
 #define FILECOIN_CORE_STORAGE_IMPL_IN_MEMORY_REPOSITORY_HPP
 
-#include "storage/repository/repository.hpp"
+#include "filecoin/storage/repository/repository.hpp"
 
 namespace fc::storage::repository {
 
diff --git a/core/storage/repository/repository.hpp b/include/filecoin/storage/repository/repository.hpp
similarity index 91%
rename from core/storage/repository/repository.hpp
rename to include/filecoin/storage/repository/repository.hpp
index d742c675bc..20da9155e1 100644
--- a/core/storage/repository/repository.hpp
+++ b/include/filecoin/storage/repository/repository.hpp
@@ -6,10 +6,10 @@
 #ifndef FILECOIN_CORE_STORAGE_REPOSITORY_HPP
 #define FILECOIN_CORE_STORAGE_REPOSITORY_HPP
 
-#include "common/outcome.hpp"
-#include "storage/config/config.hpp"
-#include "storage/ipfs/datastore.hpp"
-#include "storage/keystore/keystore.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/config/config.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/storage/keystore/keystore.hpp"
 
 namespace fc::storage::repository {
 
diff --git a/core/storage/repository/repository_error.hpp b/include/filecoin/storage/repository/repository_error.hpp
similarity index 93%
rename from core/storage/repository/repository_error.hpp
rename to include/filecoin/storage/repository/repository_error.hpp
index 8ccb22cf78..b3b8f83040 100644
--- a/core/storage/repository/repository_error.hpp
+++ b/include/filecoin/storage/repository/repository_error.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_STORAGE_REPOSITORY_ERROR_HPP
 #define FILECOIN_CORE_STORAGE_REPOSITORY_ERROR_HPP
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::storage::repository {
 
diff --git a/core/vm/actor/actor.hpp b/include/filecoin/vm/actor/actor.hpp
similarity index 94%
rename from core/vm/actor/actor.hpp
rename to include/filecoin/vm/actor/actor.hpp
index 46ed0b7065..8f0b9e8d19 100644
--- a/core/vm/actor/actor.hpp
+++ b/include/filecoin/vm/actor/actor.hpp
@@ -8,11 +8,11 @@
 
 #include <boost/operators.hpp>
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "common/buffer.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/big_int.hpp"
-#include "primitives/cid/cid.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/big_int.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
 
 namespace fc::vm::actor {
 
diff --git a/core/vm/actor/actor_encoding.hpp b/include/filecoin/vm/actor/actor_encoding.hpp
similarity index 88%
rename from core/vm/actor/actor_encoding.hpp
rename to include/filecoin/vm/actor/actor_encoding.hpp
index f9549bb308..6de1500409 100644
--- a/core/vm/actor/actor_encoding.hpp
+++ b/include/filecoin/vm/actor/actor_encoding.hpp
@@ -6,11 +6,11 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_ACTOR_ENCODING_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_ACTOR_ENCODING_HPP
 
-#include "codec/cbor/cbor.hpp"
-#include "common/outcome.hpp"
-#include "vm/actor/actor.hpp"
-#include "vm/exit_code/exit_code.hpp"
-#include "vm/runtime/runtime_types.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/vm/actor/actor.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
+#include "filecoin/vm/runtime/runtime_types.hpp"
 
 namespace fc::vm::actor {
   using runtime::InvocationOutput;
diff --git a/core/vm/actor/actor_method.hpp b/include/filecoin/vm/actor/actor_method.hpp
similarity index 87%
rename from core/vm/actor/actor_method.hpp
rename to include/filecoin/vm/actor/actor_method.hpp
index 64a6f30274..35cd93dabc 100644
--- a/core/vm/actor/actor_method.hpp
+++ b/include/filecoin/vm/actor/actor_method.hpp
@@ -6,12 +6,12 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_ACTOR_METHOD_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_ACTOR_METHOD_HPP
 
-#include "codec/cbor/cbor.hpp"
-#include "common/outcome.hpp"
-#include "vm/actor/actor.hpp"
-#include "vm/actor/actor_encoding.hpp"
-#include "vm/exit_code/exit_code.hpp"
-#include "vm/runtime/runtime.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/vm/actor/actor.hpp"
+#include "filecoin/vm/actor/actor_encoding.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
+#include "filecoin/vm/runtime/runtime.hpp"
 
 /// Declare actor method function
 #define ACTOR_METHOD_DECL() \
diff --git a/core/vm/actor/builtin/account/account_actor.hpp b/include/filecoin/vm/actor/builtin/account/account_actor.hpp
similarity index 86%
rename from core/vm/actor/builtin/account/account_actor.hpp
rename to include/filecoin/vm/actor/builtin/account/account_actor.hpp
index 172b93f3ea..dada2448cb 100644
--- a/core/vm/actor/builtin/account/account_actor.hpp
+++ b/include/filecoin/vm/actor/builtin/account/account_actor.hpp
@@ -6,10 +6,10 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_ACCOUNT_ACTOR_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_ACCOUNT_ACTOR_HPP
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "primitives/address/address_codec.hpp"
-#include "vm/actor/actor_method.hpp"
-#include "vm/state/state_tree.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
+#include "filecoin/vm/state/state_tree.hpp"
 
 namespace fc::vm::actor::builtin::account {
 
diff --git a/core/vm/actor/builtin/cron/cron_actor.hpp b/include/filecoin/vm/actor/builtin/cron/cron_actor.hpp
similarity index 94%
rename from core/vm/actor/builtin/cron/cron_actor.hpp
rename to include/filecoin/vm/actor/builtin/cron/cron_actor.hpp
index c2c0e1b98a..770f6021e6 100644
--- a/core/vm/actor/builtin/cron/cron_actor.hpp
+++ b/include/filecoin/vm/actor/builtin/cron/cron_actor.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_CRON_ACTOR_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_CRON_ACTOR_HPP
 
-#include "vm/actor/actor_method.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
 
 namespace fc::vm::actor::builtin::cron {
 
diff --git a/core/vm/actor/builtin/init/init_actor.hpp b/include/filecoin/vm/actor/builtin/init/init_actor.hpp
similarity index 90%
rename from core/vm/actor/builtin/init/init_actor.hpp
rename to include/filecoin/vm/actor/builtin/init/init_actor.hpp
index bbd6fc1f94..653650fda9 100644
--- a/core/vm/actor/builtin/init/init_actor.hpp
+++ b/include/filecoin/vm/actor/builtin/init/init_actor.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_INIT_ACTOR_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_INIT_ACTOR_HPP
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "storage/ipfs/datastore.hpp"
-#include "vm/actor/actor_method.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
 
 namespace fc::vm::actor::builtin::init {
 
diff --git a/core/vm/actor/builtin/market/actor.hpp b/include/filecoin/vm/actor/builtin/market/actor.hpp
similarity index 89%
rename from core/vm/actor/builtin/market/actor.hpp
rename to include/filecoin/vm/actor/builtin/market/actor.hpp
index a7585d6bf2..fb1f769ab1 100644
--- a/core/vm/actor/builtin/market/actor.hpp
+++ b/include/filecoin/vm/actor/builtin/market/actor.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_BUILTIN_MARKET_ACTOR_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_BUILTIN_MARKET_ACTOR_HPP
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "primitives/types.hpp"
-#include "vm/actor/actor_method.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/primitives/types.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
 
 namespace fc::vm::actor::builtin::market {
   using primitives::ChainEpoch;
diff --git a/core/vm/actor/builtin/miner/miner_actor.hpp b/include/filecoin/vm/actor/builtin/miner/miner_actor.hpp
similarity index 91%
rename from core/vm/actor/builtin/miner/miner_actor.hpp
rename to include/filecoin/vm/actor/builtin/miner/miner_actor.hpp
index 9895e53eef..0ae0a64432 100644
--- a/core/vm/actor/builtin/miner/miner_actor.hpp
+++ b/include/filecoin/vm/actor/builtin/miner/miner_actor.hpp
@@ -6,11 +6,11 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_BUILTIN_MINER_MINER_ACTOR_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_BUILTIN_MINER_MINER_ACTOR_HPP
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/address/address_codec.hpp"
-#include "vm/actor/actor_method.hpp"
-#include "vm/actor/builtin/miner/types.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
+#include "filecoin/vm/actor/builtin/miner/types.hpp"
 
 namespace fc::vm::actor::builtin::miner {
 
diff --git a/core/vm/actor/builtin/miner/policy.hpp b/include/filecoin/vm/actor/builtin/miner/policy.hpp
similarity index 97%
rename from core/vm/actor/builtin/miner/policy.hpp
rename to include/filecoin/vm/actor/builtin/miner/policy.hpp
index 226f42138b..f363e48cb1 100644
--- a/core/vm/actor/builtin/miner/policy.hpp
+++ b/include/filecoin/vm/actor/builtin/miner/policy.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_BUILTIN_MINER_POLICY_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_BUILTIN_MINER_POLICY_HPP
 
-#include "primitives/types.hpp"
+#include "filecoin/primitives/types.hpp"
 
 namespace fc::vm::actor::builtin::miner {
   using primitives::ChainEpoch;
diff --git a/core/vm/actor/builtin/miner/types.hpp b/include/filecoin/vm/actor/builtin/miner/types.hpp
similarity index 94%
rename from core/vm/actor/builtin/miner/types.hpp
rename to include/filecoin/vm/actor/builtin/miner/types.hpp
index cfea6487e6..e2d85c4160 100644
--- a/core/vm/actor/builtin/miner/types.hpp
+++ b/include/filecoin/vm/actor/builtin/miner/types.hpp
@@ -8,11 +8,11 @@
 
 #include <libp2p/multi/uvarint.hpp>
 
-#include "primitives/address/address_codec.hpp"
-#include "primitives/big_int.hpp"
-#include "primitives/chain_epoch/chain_epoch.hpp"
-#include "primitives/rle_bitset/rle_bitset.hpp"
-#include "primitives/sector/sector.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/primitives/big_int.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch.hpp"
+#include "filecoin/primitives/rle_bitset/rle_bitset.hpp"
+#include "filecoin/primitives/sector/sector.hpp"
 
 namespace fc::vm::actor::builtin::miner {
   using common::Buffer;
diff --git a/core/vm/actor/builtin/multisig/multisig_actor.hpp b/include/filecoin/vm/actor/builtin/multisig/multisig_actor.hpp
similarity index 92%
rename from core/vm/actor/builtin/multisig/multisig_actor.hpp
rename to include/filecoin/vm/actor/builtin/multisig/multisig_actor.hpp
index b7ed39366d..3de95c7dc5 100644
--- a/core/vm/actor/builtin/multisig/multisig_actor.hpp
+++ b/include/filecoin/vm/actor/builtin/multisig/multisig_actor.hpp
@@ -6,15 +6,15 @@
 #ifndef CPP_FILECOIN_VM_ACTOR_BUILTIN_MULTISIG_ACTOR_HPP
 #define CPP_FILECOIN_VM_ACTOR_BUILTIN_MULTISIG_ACTOR_HPP
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/address/address_codec.hpp"
-#include "primitives/big_int.hpp"
-#include "primitives/chain_epoch/chain_epoch.hpp"
-#include "primitives/cid/cid.hpp"
-#include "vm/actor/actor.hpp"
-#include "vm/actor/actor_method.hpp"
-#include "vm/runtime/runtime.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/primitives/big_int.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/vm/actor/actor.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
+#include "filecoin/vm/runtime/runtime.hpp"
 
 namespace fc::vm::actor::builtin::multisig {
 
diff --git a/core/vm/actor/builtin/payment_channel/payment_channel_actor.hpp b/include/filecoin/vm/actor/builtin/payment_channel/payment_channel_actor.hpp
similarity index 74%
rename from core/vm/actor/builtin/payment_channel/payment_channel_actor.hpp
rename to include/filecoin/vm/actor/builtin/payment_channel/payment_channel_actor.hpp
index dfacfaad58..8808271bb0 100644
--- a/core/vm/actor/builtin/payment_channel/payment_channel_actor.hpp
+++ b/include/filecoin/vm/actor/builtin/payment_channel/payment_channel_actor.hpp
@@ -6,13 +6,13 @@
 #ifndef CPP_FILECOIN_VM_ACTOR_BUILTIN_PAYMENT_CHANNEL_ACTOR_HPP
 #define CPP_FILECOIN_VM_ACTOR_BUILTIN_PAYMENT_CHANNEL_ACTOR_HPP
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "common/outcome.hpp"
-#include "primitives/address/address_codec.hpp"
-#include "vm/actor/actor_method.hpp"
-#include "vm/actor/builtin/payment_channel/payment_channel_actor_state.hpp"
-#include "vm/runtime/runtime.hpp"
-#include "vm/runtime/runtime_types.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
+#include "filecoin/vm/actor/builtin/payment_channel/payment_channel_actor_state.hpp"
+#include "filecoin/vm/runtime/runtime.hpp"
+#include "filecoin/vm/runtime/runtime_types.hpp"
 
 namespace fc::vm::actor::builtin::payment_channel {
 
diff --git a/core/vm/actor/builtin/payment_channel/payment_channel_actor_state.hpp b/include/filecoin/vm/actor/builtin/payment_channel/payment_channel_actor_state.hpp
similarity index 86%
rename from core/vm/actor/builtin/payment_channel/payment_channel_actor_state.hpp
rename to include/filecoin/vm/actor/builtin/payment_channel/payment_channel_actor_state.hpp
index 2e9d3224f5..4740b71c6d 100644
--- a/core/vm/actor/builtin/payment_channel/payment_channel_actor_state.hpp
+++ b/include/filecoin/vm/actor/builtin/payment_channel/payment_channel_actor_state.hpp
@@ -6,13 +6,13 @@
 #ifndef CPP_FILECOIN_VM_ACTOR_BUILTIN_PAYMENT_CHANNEL_ACTOR_STATE_HPP
 #define CPP_FILECOIN_VM_ACTOR_BUILTIN_PAYMENT_CHANNEL_ACTOR_STATE_HPP
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "common/buffer.hpp"
-#include "crypto/signature/signature.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/big_int.hpp"
-#include "primitives/chain_epoch/chain_epoch.hpp"
-#include "vm/actor/actor.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/crypto/signature/signature.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/big_int.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch.hpp"
+#include "filecoin/vm/actor/actor.hpp"
 
 namespace fc::vm::actor::builtin::payment_channel {
 
diff --git a/core/vm/actor/builtin/reward/reward_actor.hpp b/include/filecoin/vm/actor/builtin/reward/reward_actor.hpp
similarity index 85%
rename from core/vm/actor/builtin/reward/reward_actor.hpp
rename to include/filecoin/vm/actor/builtin/reward/reward_actor.hpp
index dc2cb4803e..ccca0a8fbd 100644
--- a/core/vm/actor/builtin/reward/reward_actor.hpp
+++ b/include/filecoin/vm/actor/builtin/reward/reward_actor.hpp
@@ -7,15 +7,15 @@
 #define CPP_FILECOIN_REWARD_ACTOR_HPP
 
 #include <boost/optional.hpp>
-#include "codec/cbor/streams_annotation.hpp"
-#include "common/enum.hpp"
-#include "power/power_table.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/cid/cid.hpp"
-#include "primitives/types.hpp"
-#include "storage/ipfs/datastore.hpp"
-#include "vm/actor/actor.hpp"
-#include "vm/actor/actor_method.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/common/enum.hpp"
+#include "filecoin/power/power_table.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/primitives/types.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/vm/actor/actor.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
 
 namespace fc::vm::actor::builtin::reward {
 
diff --git a/core/vm/actor/builtin/shared/shared.hpp b/include/filecoin/vm/actor/builtin/shared/shared.hpp
similarity index 80%
rename from core/vm/actor/builtin/shared/shared.hpp
rename to include/filecoin/vm/actor/builtin/shared/shared.hpp
index cb18596292..b781da3695 100644
--- a/core/vm/actor/builtin/shared/shared.hpp
+++ b/include/filecoin/vm/actor/builtin/shared/shared.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_SHARED_HPP
 #define CPP_FILECOIN_SHARED_HPP
 
-#include "primitives/address/address.hpp"
-#include "vm/actor/builtin/miner/miner_actor.hpp"
-#include "vm/runtime/runtime.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/vm/actor/builtin/miner/miner_actor.hpp"
+#include "filecoin/vm/runtime/runtime.hpp"
 
 /**
  * Code shared by multiple built-in actors
diff --git a/core/vm/actor/builtin/storage_power/policy.hpp b/include/filecoin/vm/actor/builtin/storage_power/policy.hpp
similarity index 97%
rename from core/vm/actor/builtin/storage_power/policy.hpp
rename to include/filecoin/vm/actor/builtin/storage_power/policy.hpp
index c012cc13b6..0009a469b3 100644
--- a/core/vm/actor/builtin/storage_power/policy.hpp
+++ b/include/filecoin/vm/actor/builtin/storage_power/policy.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_VM_ACTOR_BUILTIN_STORAGE_POWER_POLICY_HPP
 #define CPP_FILECOIN_VM_ACTOR_BUILTIN_STORAGE_POWER_POLICY_HPP
 
-#include "vm/actor/builtin/reward/reward_actor.hpp"
+#include "filecoin/vm/actor/builtin/reward/reward_actor.hpp"
 
 namespace fc::vm::actor::builtin::storage_power {
 
diff --git a/core/vm/actor/builtin/storage_power/storage_power_actor_export.hpp b/include/filecoin/vm/actor/builtin/storage_power/storage_power_actor_export.hpp
similarity index 93%
rename from core/vm/actor/builtin/storage_power/storage_power_actor_export.hpp
rename to include/filecoin/vm/actor/builtin/storage_power/storage_power_actor_export.hpp
index 1070d6214c..76d8bd3fc8 100644
--- a/core/vm/actor/builtin/storage_power/storage_power_actor_export.hpp
+++ b/include/filecoin/vm/actor/builtin/storage_power/storage_power_actor_export.hpp
@@ -6,12 +6,12 @@
 #ifndef CPP_FILECOIN_VM_ACTOR_BUILTIN_STORAGE_POWER_ACTOR_HPP
 #define CPP_FILECOIN_VM_ACTOR_BUILTIN_STORAGE_POWER_ACTOR_HPP
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "primitives/block/block.hpp"
-#include "primitives/types.hpp"
-#include "vm/actor/actor_method.hpp"
-#include "vm/actor/builtin/miner/types.hpp"
-#include "vm/actor/builtin/storage_power/policy.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/primitives/block/block.hpp"
+#include "filecoin/primitives/types.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
+#include "filecoin/vm/actor/builtin/miner/types.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/policy.hpp"
 
 namespace fc::vm::actor::builtin::storage_power {
 
diff --git a/core/vm/actor/builtin/storage_power/storage_power_actor_state.hpp b/include/filecoin/vm/actor/builtin/storage_power/storage_power_actor_state.hpp
similarity index 95%
rename from core/vm/actor/builtin/storage_power/storage_power_actor_state.hpp
rename to include/filecoin/vm/actor/builtin/storage_power/storage_power_actor_state.hpp
index 98b7d8d86c..514aac5e02 100644
--- a/core/vm/actor/builtin/storage_power/storage_power_actor_state.hpp
+++ b/include/filecoin/vm/actor/builtin/storage_power/storage_power_actor_state.hpp
@@ -6,15 +6,15 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_STORAGE_POWER_ACTOR_STATE_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_STORAGE_POWER_ACTOR_STATE_HPP
 
-#include "adt/balance_table_hamt.hpp"
-#include "adt/multimap.hpp"
-#include "codec/cbor/streams_annotation.hpp"
-#include "crypto/randomness/randomness_provider.hpp"
-#include "crypto/randomness/randomness_types.hpp"
-#include "power/power_table.hpp"
-#include "primitives/types.hpp"
-#include "storage/ipfs/datastore.hpp"
-#include "vm/indices/indices.hpp"
+#include "filecoin/adt/balance_table_hamt.hpp"
+#include "filecoin/adt/multimap.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/crypto/randomness/randomness_provider.hpp"
+#include "filecoin/crypto/randomness/randomness_types.hpp"
+#include "filecoin/power/power_table.hpp"
+#include "filecoin/primitives/types.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/vm/indices/indices.hpp"
 
 namespace fc::vm::actor::builtin::storage_power {
 
diff --git a/core/vm/actor/impl/invoker_impl.hpp b/include/filecoin/vm/actor/impl/invoker_impl.hpp
similarity index 89%
rename from core/vm/actor/impl/invoker_impl.hpp
rename to include/filecoin/vm/actor/impl/invoker_impl.hpp
index 708a52f155..32f1e94ad1 100644
--- a/core/vm/actor/impl/invoker_impl.hpp
+++ b/include/filecoin/vm/actor/impl/invoker_impl.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_INVOKER_IMPL_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_INVOKER_IMPL_HPP
 
-#include "vm/actor/invoker.hpp"
+#include "filecoin/vm/actor/invoker.hpp"
 
-#include "vm/actor/actor_method.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
 
 namespace fc::vm::actor {
 
diff --git a/core/vm/actor/invoker.hpp b/include/filecoin/vm/actor/invoker.hpp
similarity index 93%
rename from core/vm/actor/invoker.hpp
rename to include/filecoin/vm/actor/invoker.hpp
index 40832ee073..6b83e65bac 100644
--- a/core/vm/actor/invoker.hpp
+++ b/include/filecoin/vm/actor/invoker.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_INVOKER_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_INVOKER_HPP
 
-#include "vm/actor/actor_method.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
 
 namespace fc::vm::actor {
 
diff --git a/core/vm/exit_code/exit_code.hpp b/include/filecoin/vm/exit_code/exit_code.hpp
similarity index 99%
rename from core/vm/exit_code/exit_code.hpp
rename to include/filecoin/vm/exit_code/exit_code.hpp
index 6175ce427c..4787a66ca1 100644
--- a/core/vm/exit_code/exit_code.hpp
+++ b/include/filecoin/vm/exit_code/exit_code.hpp
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::vm {
   /**
diff --git a/core/vm/indices/indices.hpp b/include/filecoin/vm/indices/indices.hpp
similarity index 92%
rename from core/vm/indices/indices.hpp
rename to include/filecoin/vm/indices/indices.hpp
index d1e426b6b3..4d8663a2a3 100644
--- a/core/vm/indices/indices.hpp
+++ b/include/filecoin/vm/indices/indices.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_VM_INDICES_INDICES_HPP
 #define CPP_FILECOIN_VM_INDICES_INDICES_HPP
 
-#include "power/power_table.hpp"
-#include "primitives/types.hpp"
+#include "filecoin/power/power_table.hpp"
+#include "filecoin/primitives/types.hpp"
 
 namespace fc::vm::indices {
   using primitives::SectorStorageWeightDesc;
diff --git a/core/vm/interpreter/impl/interpreter_impl.hpp b/include/filecoin/vm/interpreter/impl/interpreter_impl.hpp
similarity index 90%
rename from core/vm/interpreter/impl/interpreter_impl.hpp
rename to include/filecoin/vm/interpreter/impl/interpreter_impl.hpp
index a972e4e9d3..3875301b8a 100644
--- a/core/vm/interpreter/impl/interpreter_impl.hpp
+++ b/include/filecoin/vm/interpreter/impl/interpreter_impl.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_VM_INTERPRETER_INTERPRETER_IMPL_HPP
 #define CPP_FILECOIN_CORE_VM_INTERPRETER_INTERPRETER_IMPL_HPP
 
-#include "vm/interpreter/interpreter.hpp"
-#include "vm/state/impl/state_tree_impl.hpp"
+#include "filecoin/vm/interpreter/interpreter.hpp"
+#include "filecoin/vm/state/impl/state_tree_impl.hpp"
 
 namespace fc::vm::interpreter {
   class InterpreterImpl : public Interpreter {
diff --git a/core/vm/interpreter/interpreter.hpp b/include/filecoin/vm/interpreter/interpreter.hpp
similarity index 87%
rename from core/vm/interpreter/interpreter.hpp
rename to include/filecoin/vm/interpreter/interpreter.hpp
index 4d264c8770..83a3af4a0e 100644
--- a/core/vm/interpreter/interpreter.hpp
+++ b/include/filecoin/vm/interpreter/interpreter.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_CORE_VM_INTERPRETER_INTERPRETER_HPP
 #define CPP_FILECOIN_CORE_VM_INTERPRETER_INTERPRETER_HPP
 
-#include "primitives/tipset/tipset.hpp"
-#include "storage/ipfs/datastore.hpp"
-#include "vm/indices/indices.hpp"
+#include "filecoin/primitives/tipset/tipset.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/vm/indices/indices.hpp"
 
 namespace fc::vm::interpreter {
   enum class InterpreterError {
diff --git a/core/vm/message/impl/message_signer_impl.hpp b/include/filecoin/vm/message/impl/message_signer_impl.hpp
similarity index 88%
rename from core/vm/message/impl/message_signer_impl.hpp
rename to include/filecoin/vm/message/impl/message_signer_impl.hpp
index 29cb4fee6d..4dc5fd9f1a 100644
--- a/core/vm/message/impl/message_signer_impl.hpp
+++ b/include/filecoin/vm/message/impl/message_signer_impl.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_CORE_VM_MESSAGE_SIGNER_IMPL_HPP
 #define CPP_FILECOIN_CORE_VM_MESSAGE_SIGNER_IMPL_HPP
 
-#include "common/logger.hpp"
-#include "storage/keystore/keystore.hpp"
-#include "vm/message/message_signer.hpp"
+#include "filecoin/common/logger.hpp"
+#include "filecoin/storage/keystore/keystore.hpp"
+#include "filecoin/vm/message/message_signer.hpp"
 
 namespace fc::vm::message {
 
diff --git a/core/vm/message/message.hpp b/include/filecoin/vm/message/message.hpp
similarity index 86%
rename from core/vm/message/message.hpp
rename to include/filecoin/vm/message/message.hpp
index af77b5bbd7..ab26f5741f 100644
--- a/core/vm/message/message.hpp
+++ b/include/filecoin/vm/message/message.hpp
@@ -6,17 +6,17 @@
 #ifndef CPP_FILECOIN_CORE_VM_MESSAGE_HPP
 #define CPP_FILECOIN_CORE_VM_MESSAGE_HPP
 
-#include <codec/cbor/cbor.hpp>
+#include "filecoin/codec/cbor/cbor.hpp"
 #include <gsl/span>
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "common/outcome.hpp"
-#include "crypto/signature/signature.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/address/address_codec.hpp"
-#include "primitives/big_int.hpp"
-#include "storage/ipld/ipld_block_common.hpp"
-#include "vm/actor/actor.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/crypto/signature/signature.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/primitives/big_int.hpp"
+#include "filecoin/storage/ipld/ipld_block_common.hpp"
+#include "filecoin/vm/actor/actor.hpp"
 
 namespace fc::vm::message {
 
diff --git a/core/vm/message/message_signer.hpp b/include/filecoin/vm/message/message_signer.hpp
similarity index 89%
rename from core/vm/message/message_signer.hpp
rename to include/filecoin/vm/message/message_signer.hpp
index 374b8b630b..4c172ab209 100644
--- a/core/vm/message/message_signer.hpp
+++ b/include/filecoin/vm/message/message_signer.hpp
@@ -6,9 +6,9 @@
 #ifndef CPP_FILECOIN_CORE_VM_MESSAGE_SIGNER_HPP
 #define CPP_FILECOIN_CORE_VM_MESSAGE_SIGNER_HPP
 
-#include "common/outcome.hpp"
-#include "primitives/address/address.hpp"
-#include "vm/message/message.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/vm/message/message.hpp"
 
 namespace fc::vm::message {
 
diff --git a/core/vm/message/message_util.hpp b/include/filecoin/vm/message/message_util.hpp
similarity index 88%
rename from core/vm/message/message_util.hpp
rename to include/filecoin/vm/message/message_util.hpp
index f6d370c36e..b8ccd92852 100644
--- a/core/vm/message/message_util.hpp
+++ b/include/filecoin/vm/message/message_util.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_VM_MESSAGE_UTIL_HPP
 #define CPP_FILECOIN_CORE_VM_MESSAGE_UTIL_HPP
 
-#include "primitives/cid/cid.hpp"
-#include "vm/message/message.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/vm/message/message.hpp"
 
 namespace fc::vm::message {
 
diff --git a/core/vm/runtime/actor_state_handle.hpp b/include/filecoin/vm/runtime/actor_state_handle.hpp
similarity index 94%
rename from core/vm/runtime/actor_state_handle.hpp
rename to include/filecoin/vm/runtime/actor_state_handle.hpp
index a9874e9d6f..992165d340 100644
--- a/core/vm/runtime/actor_state_handle.hpp
+++ b/include/filecoin/vm/runtime/actor_state_handle.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_VM_RUNTIME_ACTOR_STATE_HANDLE_HPP
 #define CPP_FILECOIN_CORE_VM_RUNTIME_ACTOR_STATE_HANDLE_HPP
 
-#include "vm/actor/actor.hpp"
+#include "filecoin/vm/actor/actor.hpp"
 
 namespace fc::vm::runtime {
 
diff --git a/core/vm/runtime/env.hpp b/include/filecoin/vm/runtime/env.hpp
similarity index 89%
rename from core/vm/runtime/env.hpp
rename to include/filecoin/vm/runtime/env.hpp
index 351c980639..4714d242b7 100644
--- a/core/vm/runtime/env.hpp
+++ b/include/filecoin/vm/runtime/env.hpp
@@ -6,10 +6,10 @@
 #ifndef FILECOIN_CORE_VM_RUNTIME_ENV_HPP
 #define FILECOIN_CORE_VM_RUNTIME_ENV_HPP
 
-#include "crypto/randomness/randomness_provider.hpp"
-#include "vm/actor/invoker.hpp"
-#include "vm/indices/indices.hpp"
-#include "vm/state/state_tree.hpp"
+#include "filecoin/crypto/randomness/randomness_provider.hpp"
+#include "filecoin/vm/actor/invoker.hpp"
+#include "filecoin/vm/indices/indices.hpp"
+#include "filecoin/vm/state/state_tree.hpp"
 
 namespace fc::vm::runtime {
   using actor::Invoker;
diff --git a/core/vm/runtime/gas_cost.hpp b/include/filecoin/vm/runtime/gas_cost.hpp
similarity index 98%
rename from core/vm/runtime/gas_cost.hpp
rename to include/filecoin/vm/runtime/gas_cost.hpp
index 862c17d081..81bd45b865 100644
--- a/core/vm/runtime/gas_cost.hpp
+++ b/include/filecoin/vm/runtime/gas_cost.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_VM_RUNTIME_GAS_COST_HPP
 #define CPP_FILECOIN_CORE_VM_RUNTIME_GAS_COST_HPP
 
-#include "primitives/big_int.hpp"
+#include "filecoin/primitives/big_int.hpp"
 
 namespace fc::vm::runtime {
 
diff --git a/core/vm/runtime/impl/actor_state_handle_impl.hpp b/include/filecoin/vm/runtime/impl/actor_state_handle_impl.hpp
similarity index 93%
rename from core/vm/runtime/impl/actor_state_handle_impl.hpp
rename to include/filecoin/vm/runtime/impl/actor_state_handle_impl.hpp
index 42da6e3815..60d48fbe0a 100644
--- a/core/vm/runtime/impl/actor_state_handle_impl.hpp
+++ b/include/filecoin/vm/runtime/impl/actor_state_handle_impl.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_VM_RUNTIME_IMPL_ACTOR_STATE_HANDLE_IMPL_HPP
 #define CPP_FILECOIN_CORE_VM_RUNTIME_IMPL_ACTOR_STATE_HANDLE_IMPL_HPP
 
-#include "vm/runtime/actor_state_handle.hpp"
+#include "filecoin/vm/runtime/actor_state_handle.hpp"
 
 namespace fc::vm::runtime {
 
diff --git a/core/vm/runtime/impl/runtime_impl.hpp b/include/filecoin/vm/runtime/impl/runtime_impl.hpp
similarity index 93%
rename from core/vm/runtime/impl/runtime_impl.hpp
rename to include/filecoin/vm/runtime/impl/runtime_impl.hpp
index 8c39e22621..f9709bcfbd 100644
--- a/core/vm/runtime/impl/runtime_impl.hpp
+++ b/include/filecoin/vm/runtime/impl/runtime_impl.hpp
@@ -6,13 +6,13 @@
 #ifndef CPP_FILECOIN_CORE_VM_RUNTIME_IMPL_RUNTIME_IMPL_HPP
 #define CPP_FILECOIN_CORE_VM_RUNTIME_IMPL_RUNTIME_IMPL_HPP
 
-#include "crypto/randomness/randomness_provider.hpp"
-#include "storage/ipfs/datastore.hpp"
-#include "vm/actor/invoker.hpp"
-#include "vm/runtime/actor_state_handle.hpp"
-#include "vm/runtime/env.hpp"
-#include "vm/runtime/runtime.hpp"
-#include "vm/state/state_tree.hpp"
+#include "filecoin/crypto/randomness/randomness_provider.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/vm/actor/invoker.hpp"
+#include "filecoin/vm/runtime/actor_state_handle.hpp"
+#include "filecoin/vm/runtime/env.hpp"
+#include "filecoin/vm/runtime/runtime.hpp"
+#include "filecoin/vm/state/state_tree.hpp"
 
 namespace fc::vm::runtime {
 
diff --git a/core/vm/runtime/runtime.hpp b/include/filecoin/vm/runtime/runtime.hpp
similarity index 92%
rename from core/vm/runtime/runtime.hpp
rename to include/filecoin/vm/runtime/runtime.hpp
index 837c7029ca..cffd86d930 100644
--- a/core/vm/runtime/runtime.hpp
+++ b/include/filecoin/vm/runtime/runtime.hpp
@@ -8,19 +8,19 @@
 
 #include <tuple>
 
-#include "common/outcome.hpp"
-#include "crypto/randomness/randomness_types.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/block/block.hpp"
-#include "primitives/chain_epoch/chain_epoch.hpp"
-#include "primitives/sector/sector.hpp"
-#include "storage/ipfs/datastore.hpp"
-#include "vm/actor/actor_encoding.hpp"
-#include "vm/exit_code/exit_code.hpp"
-#include "vm/indices/indices.hpp"
-#include "vm/message/message.hpp"
-#include "vm/runtime/actor_state_handle.hpp"
-#include "vm/runtime/runtime_types.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/crypto/randomness/randomness_types.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/block/block.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch.hpp"
+#include "filecoin/primitives/sector/sector.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/vm/actor/actor_encoding.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
+#include "filecoin/vm/indices/indices.hpp"
+#include "filecoin/vm/message/message.hpp"
+#include "filecoin/vm/runtime/actor_state_handle.hpp"
+#include "filecoin/vm/runtime/runtime_types.hpp"
 
 namespace fc::vm::runtime {
 
diff --git a/core/vm/runtime/runtime_error.hpp b/include/filecoin/vm/runtime/runtime_error.hpp
similarity index 94%
rename from core/vm/runtime/runtime_error.hpp
rename to include/filecoin/vm/runtime/runtime_error.hpp
index edff6b9d9b..bb1ecad99a 100644
--- a/core/vm/runtime/runtime_error.hpp
+++ b/include/filecoin/vm/runtime/runtime_error.hpp
@@ -6,7 +6,7 @@
 #ifndef FILECOIN_CORE_VM_RUNTIME_RUNTIM_ERROR
 #define FILECOIN_CORE_VM_RUNTIME_RUNTIM_ERROR
 
-#include "common/outcome.hpp"
+#include "filecoin/common/outcome.hpp"
 
 namespace fc::vm::runtime {
 
diff --git a/core/vm/runtime/runtime_types.hpp b/include/filecoin/vm/runtime/runtime_types.hpp
similarity index 81%
rename from core/vm/runtime/runtime_types.hpp
rename to include/filecoin/vm/runtime/runtime_types.hpp
index 39baa36a9e..0300dfec6a 100644
--- a/core/vm/runtime/runtime_types.hpp
+++ b/include/filecoin/vm/runtime/runtime_types.hpp
@@ -6,11 +6,11 @@
 #ifndef CPP_FILECOIN_CORE_VM_RUNTIME_RUNTIME_TYPES_HPP
 #define CPP_FILECOIN_CORE_VM_RUNTIME_RUNTIME_TYPES_HPP
 
-#include "codec/cbor/streams_annotation.hpp"
-#include "common/buffer.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/big_int.hpp"
-#include "vm/exit_code/exit_code.hpp"
+#include "filecoin/codec/cbor/streams_annotation.hpp"
+#include "filecoin/common/buffer.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/big_int.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
 
 namespace fc::vm::runtime {
 
diff --git a/core/vm/state/impl/state_tree_impl.hpp b/include/filecoin/vm/state/impl/state_tree_impl.hpp
similarity index 92%
rename from core/vm/state/impl/state_tree_impl.hpp
rename to include/filecoin/vm/state/impl/state_tree_impl.hpp
index 7505d66be6..d9e5203704 100644
--- a/core/vm/state/impl/state_tree_impl.hpp
+++ b/include/filecoin/vm/state/impl/state_tree_impl.hpp
@@ -6,10 +6,10 @@
 #ifndef CPP_FILECOIN_CORE_VM_STATE_STATE_TREE_IMPL_HPP
 #define CPP_FILECOIN_CORE_VM_STATE_STATE_TREE_IMPL_HPP
 
-#include "vm/state/state_tree.hpp"
+#include "filecoin/vm/state/state_tree.hpp"
 
-#include "storage/hamt/hamt.hpp"
-#include "vm/actor/actor.hpp"
+#include "filecoin/storage/hamt/hamt.hpp"
+#include "filecoin/vm/actor/actor.hpp"
 
 namespace fc::vm::state {
 
diff --git a/core/vm/state/state_tree.hpp b/include/filecoin/vm/state/state_tree.hpp
similarity index 94%
rename from core/vm/state/state_tree.hpp
rename to include/filecoin/vm/state/state_tree.hpp
index c5edf09398..d4d52cd7d9 100644
--- a/core/vm/state/state_tree.hpp
+++ b/include/filecoin/vm/state/state_tree.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_CORE_VM_STATE_STATE_TREE_HPP
 #define CPP_FILECOIN_CORE_VM_STATE_STATE_TREE_HPP
 
-#include "storage/hamt/hamt.hpp"
-#include "vm/actor/actor.hpp"
+#include "filecoin/storage/hamt/hamt.hpp"
+#include "filecoin/vm/actor/actor.hpp"
 
 namespace fc::vm::state {
 
diff --git a/test/core/adt/array_test.cpp b/test/core/adt/array_test.cpp
index a3bfa457c3..a8b6238ee2 100644
--- a/test/core/adt/array_test.cpp
+++ b/test/core/adt/array_test.cpp
@@ -7,9 +7,9 @@
 
 #include <gtest/gtest.h>
 
-#include "adt/array.hpp"
-#include "common/outcome.hpp"
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/adt/array.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/cbor.hpp"
 #include "testutil/literals.hpp"
 
diff --git a/test/core/adt/balance_table_hamt_test.cpp b/test/core/adt/balance_table_hamt_test.cpp
index f5a52c371e..5eac95c332 100644
--- a/test/core/adt/balance_table_hamt_test.cpp
+++ b/test/core/adt/balance_table_hamt_test.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "adt/balance_table_hamt.hpp"
+#include "filecoin/adt/balance_table_hamt.hpp"
 
 #include <gtest/gtest.h>
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/outcome.hpp"
 
 using fc::CID;
diff --git a/test/core/adt/multimap_test.cpp b/test/core/adt/multimap_test.cpp
index 4199a09e80..1f2f34539f 100644
--- a/test/core/adt/multimap_test.cpp
+++ b/test/core/adt/multimap_test.cpp
@@ -5,10 +5,10 @@
 
 #include <gtest/gtest.h>
 
-#include "adt/multimap.hpp"
-#include "common/outcome.hpp"
-#include "storage/hamt/hamt.hpp"
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/adt/multimap.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/hamt/hamt.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/cbor.hpp"
 #include "testutil/literals.hpp"
 
diff --git a/test/core/blockchain/message_pool/gas_price_scored_message_storage_test.cpp b/test/core/blockchain/message_pool/gas_price_scored_message_storage_test.cpp
index 8488092360..ae62320d97 100644
--- a/test/core/blockchain/message_pool/gas_price_scored_message_storage_test.cpp
+++ b/test/core/blockchain/message_pool/gas_price_scored_message_storage_test.cpp
@@ -5,8 +5,8 @@
 
 #include <gtest/gtest.h>
 
-#include "blockchain/message_pool/impl/gas_price_scored_message_storage.hpp"
-#include "blockchain/message_pool/message_pool_error.hpp"
+#include "filecoin/blockchain/message_pool/impl/gas_price_scored_message_storage.hpp"
+#include "filecoin/blockchain/message_pool/message_pool_error.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
 #include "testutil/vm/message/message_test_util.hpp"
diff --git a/test/core/blockchain/production/block_producer_test.cpp b/test/core/blockchain/production/block_producer_test.cpp
index 25663d4379..c06f040b76 100644
--- a/test/core/blockchain/production/block_producer_test.cpp
+++ b/test/core/blockchain/production/block_producer_test.cpp
@@ -5,7 +5,7 @@
 
 #include "block_producer_test.hpp"
 
-#include "codec/cbor/cbor.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
 
 using testing::_;
 
diff --git a/test/core/blockchain/production/block_producer_test.hpp b/test/core/blockchain/production/block_producer_test.hpp
index e64f952bbc..21cee92852 100644
--- a/test/core/blockchain/production/block_producer_test.hpp
+++ b/test/core/blockchain/production/block_producer_test.hpp
@@ -8,14 +8,14 @@
 
 #include <gtest/gtest.h>
 #include <libp2p/multi/content_identifier_codec.hpp>
-#include "blockchain/message_pool/message_storage.hpp"
-#include "blockchain/production/impl/block_producer_impl.hpp"
-#include "clock/impl/chain_epoch_clock_impl.hpp"
-#include "clock/time.hpp"
-#include "crypto/bls/impl/bls_provider_impl.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/cid/cid.hpp"
-#include "primitives/tipset/tipset.hpp"
+#include "filecoin/blockchain/message_pool/message_storage.hpp"
+#include "filecoin/blockchain/production/impl/block_producer_impl.hpp"
+#include "filecoin/clock/impl/chain_epoch_clock_impl.hpp"
+#include "filecoin/clock/time.hpp"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
+#include "filecoin/primitives/tipset/tipset.hpp"
 #include "testutil/cbor.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/mocks/blockchain/message_pool/message_storage_mock.hpp"
diff --git a/test/core/clock/chain_epoch_clock_test.cpp b/test/core/clock/chain_epoch_clock_test.cpp
index de5deae455..fabc37535d 100644
--- a/test/core/clock/chain_epoch_clock_test.cpp
+++ b/test/core/clock/chain_epoch_clock_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "clock/impl/chain_epoch_clock_impl.hpp"
+#include "filecoin/clock/impl/chain_epoch_clock_impl.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/outcome.hpp"
diff --git a/test/core/clock/time_test.cpp b/test/core/clock/time_test.cpp
index 4b8d8da098..cc9fcbe3b6 100644
--- a/test/core/clock/time_test.cpp
+++ b/test/core/clock/time_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "clock/time.hpp"
+#include "filecoin/clock/time.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/outcome.hpp"
diff --git a/test/core/codec/cbor/cbor_test.cpp b/test/core/codec/cbor/cbor_test.cpp
index 60ff9dc0fd..949c212e4d 100644
--- a/test/core/codec/cbor/cbor_test.cpp
+++ b/test/core/codec/cbor/cbor_test.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/cbor/cbor.hpp"
-#include "primitives/big_int.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/primitives/big_int.hpp"
 
 #include <gtest/gtest.h>
-#include "primitives/cid/cid.hpp"
+#include "filecoin/primitives/cid/cid.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
 
diff --git a/test/core/codec/rleplus/rle_plus_codec_test.cpp b/test/core/codec/rleplus/rle_plus_codec_test.cpp
index d5d102f2e4..20852e4903 100644
--- a/test/core/codec/rleplus/rle_plus_codec_test.cpp
+++ b/test/core/codec/rleplus/rle_plus_codec_test.cpp
@@ -5,7 +5,7 @@
 
 #include <gtest/gtest.h>
 
-#include "core/codec/rleplus/rle_plus_codec_tester.hpp"
+#include "rle_plus_codec_tester.hpp"
 
 using fc::codec::rle::decode;
 using fc::codec::rle::RLEPlusDecodeError;
diff --git a/test/core/codec/rleplus/rle_plus_codec_tester.hpp b/test/core/codec/rleplus/rle_plus_codec_tester.hpp
index b816195f3e..61635923c2 100644
--- a/test/core/codec/rleplus/rle_plus_codec_tester.hpp
+++ b/test/core/codec/rleplus/rle_plus_codec_tester.hpp
@@ -10,7 +10,7 @@
 
 #include <gtest/gtest.h>
 
-#include "codec/rle/rle_plus.hpp"
+#include "filecoin/codec/rle/rle_plus.hpp"
 #include "testutil/outcome.hpp"
 
 /**
diff --git a/test/core/common/blob_test.cpp b/test/core/common/blob_test.cpp
index 36e49d6ce1..642cd173ae 100644
--- a/test/core/common/blob_test.cpp
+++ b/test/core/common/blob_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/blob.hpp"
+#include "filecoin/common/blob.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/core/common/hexutil_test.cpp b/test/core/common/hexutil_test.cpp
index f47acd63fd..930d25dd7c 100644
--- a/test/core/common/hexutil_test.cpp
+++ b/test/core/common/hexutil_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/hexutil.hpp"
+#include "filecoin/common/hexutil.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/literals.hpp"
diff --git a/test/core/common/le_encoder_test.cpp b/test/core/common/le_encoder_test.cpp
index 5939b8c461..2298674df4 100644
--- a/test/core/common/le_encoder_test.cpp
+++ b/test/core/common/le_encoder_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/le_encoder.hpp"
+#include "filecoin/common/le_encoder.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/core/crypto/blake2_test.cpp b/test/core/crypto/blake2_test.cpp
index f3756986c7..5a0533563f 100644
--- a/test/core/crypto/blake2_test.cpp
+++ b/test/core/crypto/blake2_test.cpp
@@ -6,8 +6,8 @@
 #include <gtest/gtest.h>
 #include <stdio.h>
 
-#include "crypto/blake2/blake2b.h"
-#include "crypto/blake2/blake2s.h"
+#include "filecoin/crypto/blake2/blake2b.h"
+#include "filecoin/crypto/blake2/blake2s.h"
 #include "testutil/literals.hpp"
 
 // Deterministic sequences (Fibonacci generator).
diff --git a/test/core/crypto/bls_provider_test.cpp b/test/core/crypto/bls_provider_test.cpp
index 115f84fd89..efb0500174 100644
--- a/test/core/crypto/bls_provider_test.cpp
+++ b/test/core/crypto/bls_provider_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
 
 #include <vector>
 #include <algorithm>
diff --git a/test/core/crypto/murmur_test.cpp b/test/core/crypto/murmur_test.cpp
index 0c995b31c9..50b99814ab 100644
--- a/test/core/crypto/murmur_test.cpp
+++ b/test/core/crypto/murmur_test.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/murmur/murmur.hpp"
+#include "filecoin/crypto/murmur/murmur.hpp"
 
 #include <gtest/gtest.h>
-#include "common/hexutil.hpp"
+#include "filecoin/common/hexutil.hpp"
 
 class MurmurTest
     : public ::testing::TestWithParam<std::pair<std::string, std::string>> {
diff --git a/test/core/crypto/randomness/randomness_provider_test.cpp b/test/core/crypto/randomness/randomness_provider_test.cpp
index faac7348f8..4a0bbc9417 100644
--- a/test/core/crypto/randomness/randomness_provider_test.cpp
+++ b/test/core/crypto/randomness/randomness_provider_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/randomness/impl/randomness_provider_impl.hpp"
+#include "filecoin/crypto/randomness/impl/randomness_provider_impl.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/core/crypto/vrf/vrf_encoder_test.cpp b/test/core/crypto/vrf/vrf_encoder_test.cpp
index 659846dbd2..6967ccc737 100644
--- a/test/core/crypto/vrf/vrf_encoder_test.cpp
+++ b/test/core/crypto/vrf/vrf_encoder_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/vrf/vrf_hash_encoder.hpp"
+#include "filecoin/crypto/vrf/vrf_hash_encoder.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/literals.hpp"
diff --git a/test/core/crypto/vrf/vrf_provider_test.cpp b/test/core/crypto/vrf/vrf_provider_test.cpp
index 2a68049c5d..1382b97a8b 100644
--- a/test/core/crypto/vrf/vrf_provider_test.cpp
+++ b/test/core/crypto/vrf/vrf_provider_test.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/vrf/impl/vrf_provider_impl.hpp"
+#include "filecoin/crypto/vrf/impl/vrf_provider_impl.hpp"
 
 #include <gtest/gtest.h>
-#include "crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
 
diff --git a/test/core/fslock/fslock_test.cpp b/test/core/fslock/fslock_test.cpp
index f0da5a7830..0ccb3ee981 100644
--- a/test/core/fslock/fslock_test.cpp
+++ b/test/core/fslock/fslock_test.cpp
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "fslock/fslock.hpp"
+#include "filecoin/fslock/fslock.hpp"
 
 #include <gtest/gtest.h>
 #include <thread>
-#include "fslock/fslock_error.hpp"
-#include "storage/filestore/impl/filesystem/filesystem_file.hpp"
+#include "filecoin/fslock/fslock_error.hpp"
+#include "filecoin/storage/filestore/impl/filesystem/filesystem_file.hpp"
 #include "testutil/outcome.hpp"
 #include "testutil/storage/base_fs_test.hpp"
 
diff --git a/test/core/power/power_table_hamt_test.cpp b/test/core/power/power_table_hamt_test.cpp
index 1f5868a472..e28811f4c0 100644
--- a/test/core/power/power_table_hamt_test.cpp
+++ b/test/core/power/power_table_hamt_test.cpp
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "power/impl/power_table_hamt.hpp"
+#include "filecoin/power/impl/power_table_hamt.hpp"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <power/power_table_error.hpp>
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/power/power_table_error.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/outcome.hpp"
 
 using fc::power::PowerTableError;
diff --git a/test/core/power/power_table_test.cpp b/test/core/power/power_table_test.cpp
index 5526793f3b..19b297378c 100644
--- a/test/core/power/power_table_test.cpp
+++ b/test/core/power/power_table_test.cpp
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "power/power_table.hpp"
+#include "filecoin/power/power_table.hpp"
 
 #include <gtest/gtest.h>
 
-#include "power/impl/power_table_impl.hpp"
-#include "power/power_table_error.hpp"
+#include "filecoin/power/impl/power_table_impl.hpp"
+#include "filecoin/power/power_table_error.hpp"
 #include "testutil/outcome.hpp"
 
 using fc::power::PowerTable;
diff --git a/test/core/primitives/address/address_codec_test.cpp b/test/core/primitives/address/address_codec_test.cpp
index 5981ae9f59..96177fb963 100644
--- a/test/core/primitives/address/address_codec_test.cpp
+++ b/test/core/primitives/address/address_codec_test.cpp
@@ -7,8 +7,8 @@
 #include <algorithm>
 #include <unordered_map>
 
-#include "codec/cbor/cbor.hpp"
-#include "primitives/address/address_codec.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
 
diff --git a/test/core/primitives/address/address_test.cpp b/test/core/primitives/address/address_test.cpp
index d149c689f9..a388ba1c36 100644
--- a/test/core/primitives/address/address_test.cpp
+++ b/test/core/primitives/address/address_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/address/address.hpp"
+#include "filecoin/primitives/address/address.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/core/primitives/address/address_verifier_test.cpp b/test/core/primitives/address/address_verifier_test.cpp
index 3653468f30..f0f3d2e6b8 100644
--- a/test/core/primitives/address/address_verifier_test.cpp
+++ b/test/core/primitives/address/address_verifier_test.cpp
@@ -5,10 +5,10 @@
 
 #include <gtest/gtest.h>
 
-#include "crypto/blake2/blake2b160.hpp"
-#include "crypto/bls/impl/bls_provider_impl.hpp"
-#include "crypto/secp256k1/secp256k1_provider.hpp"
-#include "primitives/address/address.hpp"
+#include "filecoin/crypto/blake2/blake2b160.hpp"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/crypto/secp256k1/secp256k1_provider.hpp"
+#include "filecoin/primitives/address/address.hpp"
 #include "testutil/outcome.hpp"
 
 using fc::crypto::blake2b::blake2b_160;
diff --git a/test/core/primitives/big_int_test.cpp b/test/core/primitives/big_int_test.cpp
index ff412ef266..1b2581f9ad 100644
--- a/test/core/primitives/big_int_test.cpp
+++ b/test/core/primitives/big_int_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/big_int.hpp"
+#include "filecoin/primitives/big_int.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/core/primitives/block/block_test.cpp b/test/core/primitives/block/block_test.cpp
index b2c270f7d6..238c9594e0 100644
--- a/test/core/primitives/block/block_test.cpp
+++ b/test/core/primitives/block/block_test.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/block/block.hpp"
+#include "filecoin/primitives/block/block.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/cbor.hpp"
-#include "common/hexutil.hpp"
+#include "filecoin/common/hexutil.hpp"
 
 /**
  * @given block header and its serialized representation from go
diff --git a/test/core/primitives/chain_epoch/chain_epoch_codec_test.cpp b/test/core/primitives/chain_epoch/chain_epoch_codec_test.cpp
index 72d6ebb91d..b35547a1ad 100644
--- a/test/core/primitives/chain_epoch/chain_epoch_codec_test.cpp
+++ b/test/core/primitives/chain_epoch/chain_epoch_codec_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/chain_epoch/chain_epoch_codec.hpp"
+#include "filecoin/primitives/chain_epoch/chain_epoch_codec.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/core/primitives/cid/cid_json_test.cpp b/test/core/primitives/cid/cid_json_test.cpp
index 8b08d6c425..ba5c65f531 100644
--- a/test/core/primitives/cid/cid_json_test.cpp
+++ b/test/core/primitives/cid/cid_json_test.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/cid/json_codec.hpp"
+#include "filecoin/primitives/cid/json_codec.hpp"
 
 #include <gtest/gtest.h>
 #include <boost/algorithm/string.hpp>
-#include "primitives/cid/cid_of_cbor.hpp"
+#include "filecoin/primitives/cid/cid_of_cbor.hpp"
 #include "testutil/outcome.hpp"
 
 using namespace fc::primitives::cid;
diff --git a/test/core/primitives/rle_bitset/rle_bitset_test.cpp b/test/core/primitives/rle_bitset/rle_bitset_test.cpp
index c1e6d27947..246ae4d781 100644
--- a/test/core/primitives/rle_bitset/rle_bitset_test.cpp
+++ b/test/core/primitives/rle_bitset/rle_bitset_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/rle_bitset/rle_bitset.hpp"
+#include "filecoin/primitives/rle_bitset/rle_bitset.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/cbor.hpp"
diff --git a/test/core/primitives/ticket/epost_proof_codec_test.cpp b/test/core/primitives/ticket/epost_proof_codec_test.cpp
index d9f439f481..d26149b83a 100644
--- a/test/core/primitives/ticket/epost_proof_codec_test.cpp
+++ b/test/core/primitives/ticket/epost_proof_codec_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/ticket/epost_ticket_codec.hpp"
+#include "filecoin/primitives/ticket/epost_ticket_codec.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/outcome.hpp"
diff --git a/test/core/primitives/ticket/epost_ticket_codec_test.cpp b/test/core/primitives/ticket/epost_ticket_codec_test.cpp
index d16cbadfd1..69934bd7e0 100644
--- a/test/core/primitives/ticket/epost_ticket_codec_test.cpp
+++ b/test/core/primitives/ticket/epost_ticket_codec_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/ticket/epost_ticket_codec.hpp"
+#include "filecoin/primitives/ticket/epost_ticket_codec.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/outcome.hpp"
diff --git a/test/core/primitives/ticket/epost_ticket_test.cpp b/test/core/primitives/ticket/epost_ticket_test.cpp
index 9580acb246..0bca184685 100644
--- a/test/core/primitives/ticket/epost_ticket_test.cpp
+++ b/test/core/primitives/ticket/epost_ticket_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/ticket/ticket.hpp"
+#include "filecoin/primitives/ticket/ticket.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/outcome.hpp"
diff --git a/test/core/primitives/ticket/ticket_codec_test.cpp b/test/core/primitives/ticket/ticket_codec_test.cpp
index 8c464f2e6f..83a6be0562 100644
--- a/test/core/primitives/ticket/ticket_codec_test.cpp
+++ b/test/core/primitives/ticket/ticket_codec_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/ticket/ticket_codec.hpp"
+#include "filecoin/primitives/ticket/ticket_codec.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/outcome.hpp"
diff --git a/test/core/primitives/ticket/ticket_test.cpp b/test/core/primitives/ticket/ticket_test.cpp
index 4bc7a7dacb..a771bfd356 100644
--- a/test/core/primitives/ticket/ticket_test.cpp
+++ b/test/core/primitives/ticket/ticket_test.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/ticket/ticket.hpp"
+#include "filecoin/primitives/ticket/ticket.hpp"
 
 #include <gtest/gtest.h>
-#include "common/hexutil.hpp"
+#include "filecoin/common/hexutil.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
 #include "testutil/primitives/ticket/printer.hpp"
diff --git a/test/core/primitives/tipset/tipset_key_test.cpp b/test/core/primitives/tipset/tipset_key_test.cpp
index 410e057795..0c9e848b50 100644
--- a/test/core/primitives/tipset/tipset_key_test.cpp
+++ b/test/core/primitives/tipset/tipset_key_test.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/tipset/tipset_key.hpp"
+#include "filecoin/primitives/tipset/tipset_key.hpp"
 
 #include <gtest/gtest.h>
-#include "common/hexutil.hpp"
+#include "filecoin/common/hexutil.hpp"
 #include "testutil/cbor.hpp"
 
 struct TipsetKeyTest : public ::testing::Test {
diff --git a/test/core/primitives/tipset/tipset_test.cpp b/test/core/primitives/tipset/tipset_test.cpp
index 3936a01694..11ac5bf5ce 100644
--- a/test/core/primitives/tipset/tipset_test.cpp
+++ b/test/core/primitives/tipset/tipset_test.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "primitives/tipset/tipset.hpp"
+#include "filecoin/primitives/tipset/tipset.hpp"
 
 #include <gtest/gtest.h>
-#include "primitives/cid/cid_of_cbor.hpp"
-#include "common/hexutil.hpp"
+#include "filecoin/primitives/cid/cid_of_cbor.hpp"
+#include "filecoin/common/hexutil.hpp"
 #include "testutil/cbor.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
diff --git a/test/core/proofs/proofs_test.cpp b/test/core/proofs/proofs_test.cpp
index 6bb1ab244b..8dc76b3553 100644
--- a/test/core/proofs/proofs_test.cpp
+++ b/test/core/proofs/proofs_test.cpp
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "proofs/proofs.hpp"
+#include "filecoin/proofs/proofs.hpp"
 
 #include <gtest/gtest.h>
 #include <random>
-#include "proofs/proof_param_provider.hpp"
-#include "storage/filestore/impl/filesystem/filesystem_file.hpp"
+#include "filecoin/proofs/proof_param_provider.hpp"
+#include "filecoin/storage/filestore/impl/filesystem/filesystem_file.hpp"
 #include "testutil/outcome.hpp"
 #include "testutil/storage/base_fs_test.hpp"
 
diff --git a/test/core/storage/amt/amt_test.cpp b/test/core/storage/amt/amt_test.cpp
index dc865e2df1..ab06220c45 100644
--- a/test/core/storage/amt/amt_test.cpp
+++ b/test/core/storage/amt/amt_test.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/amt/amt.hpp"
+#include "filecoin/storage/amt/amt.hpp"
 
 #include <gtest/gtest.h>
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/cbor.hpp"
 
 using fc::codec::cbor::encode;
diff --git a/test/core/storage/chain/chain_data_store/chain_data_store_test.cpp b/test/core/storage/chain/chain_data_store/chain_data_store_test.cpp
index 2fee3e69e5..e4c5ff810d 100644
--- a/test/core/storage/chain/chain_data_store/chain_data_store_test.cpp
+++ b/test/core/storage/chain/chain_data_store/chain_data_store_test.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/chain/impl/chain_data_store_impl.hpp"
+#include "filecoin/storage/chain/impl/chain_data_store_impl.hpp"
 
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include <gtest/gtest.h>
 #include "testutil/outcome.hpp"
 
diff --git a/test/core/storage/chain/chain_store/chain_store_test.cpp b/test/core/storage/chain/chain_store/chain_store_test.cpp
index d6572779c5..b7781ba729 100644
--- a/test/core/storage/chain/chain_store/chain_store_test.cpp
+++ b/test/core/storage/chain/chain_store/chain_store_test.cpp
@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/chain/impl/chain_store_impl.hpp"
+#include "filecoin/storage/chain/impl/chain_store_impl.hpp"
 
 #include <gtest/gtest.h>
-#include "blockchain/impl/block_validator_impl.hpp"
-#include "blockchain/impl/weight_calculator_impl.hpp"
-#include "common/hexutil.hpp"
-#include "primitives/cid/cid_of_cbor.hpp"
-#include "storage/chain/impl/chain_data_store_impl.hpp"
-#include "storage/ipfs/impl/ipfs_block_service.hpp"
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/blockchain/impl/block_validator_impl.hpp"
+#include "filecoin/blockchain/impl/weight_calculator_impl.hpp"
+#include "filecoin/common/hexutil.hpp"
+#include "filecoin/primitives/cid/cid_of_cbor.hpp"
+#include "filecoin/storage/chain/impl/chain_data_store_impl.hpp"
+#include "filecoin/storage/ipfs/impl/ipfs_block_service.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/cbor.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
diff --git a/test/core/storage/chain/datastore_key/datastore_key_cbor_test.cpp b/test/core/storage/chain/datastore_key/datastore_key_cbor_test.cpp
index 0c49393efb..6b58f8ca86 100644
--- a/test/core/storage/chain/datastore_key/datastore_key_cbor_test.cpp
+++ b/test/core/storage/chain/datastore_key/datastore_key_cbor_test.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/chain/datastore_key.hpp"
+#include "filecoin/storage/chain/datastore_key.hpp"
 
 #include <gtest/gtest.h>
-#include "codec/cbor/cbor.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
 #include "testutil/outcome.hpp"
 
 using namespace fc::storage;
diff --git a/test/core/storage/chain/datastore_key/datastore_key_compare_test.cpp b/test/core/storage/chain/datastore_key/datastore_key_compare_test.cpp
index 8cb1c92d88..a445f8d980 100644
--- a/test/core/storage/chain/datastore_key/datastore_key_compare_test.cpp
+++ b/test/core/storage/chain/datastore_key/datastore_key_compare_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/chain/datastore_key.hpp"
+#include "filecoin/storage/chain/datastore_key.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/core/storage/chain/datastore_key/datastore_key_create_test.cpp b/test/core/storage/chain/datastore_key/datastore_key_create_test.cpp
index 2dac4a0e34..7f71f7fa1c 100644
--- a/test/core/storage/chain/datastore_key/datastore_key_create_test.cpp
+++ b/test/core/storage/chain/datastore_key/datastore_key_create_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/chain/datastore_key.hpp"
+#include "filecoin/storage/chain/datastore_key.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/core/storage/config/config_test.cpp b/test/core/storage/config/config_test.cpp
index 852e0c3103..7a4556e6a8 100644
--- a/test/core/storage/config/config_test.cpp
+++ b/test/core/storage/config/config_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/config/config.hpp"
+#include "filecoin/storage/config/config.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/core/storage/filestore/filesystem/filesystem_file_test.cpp b/test/core/storage/filestore/filesystem/filesystem_file_test.cpp
index 4cb27d0152..5493645fa3 100644
--- a/test/core/storage/filestore/filesystem/filesystem_file_test.cpp
+++ b/test/core/storage/filestore/filesystem/filesystem_file_test.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/filestore/impl/filesystem/filesystem_file.hpp"
+#include "filecoin/storage/filestore/impl/filesystem/filesystem_file.hpp"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include "storage/filestore/filestore_error.hpp"
+#include "filecoin/storage/filestore/filestore_error.hpp"
 #include "testutil/outcome.hpp"
 #include "testutil/storage/base_fs_test.hpp"
 
diff --git a/test/core/storage/filestore/filesystem/filesystem_filestore_test.cpp b/test/core/storage/filestore/filesystem/filesystem_filestore_test.cpp
index 60261f9fa6..0031e3b1b1 100644
--- a/test/core/storage/filestore/filesystem/filesystem_filestore_test.cpp
+++ b/test/core/storage/filestore/filesystem/filesystem_filestore_test.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/filestore/impl/filesystem/filesystem_filestore.hpp"
+#include "filecoin/storage/filestore/impl/filesystem/filesystem_filestore.hpp"
 
 #include <gtest/gtest.h>
-#include "storage/filestore/filestore_error.hpp"
+#include "filecoin/storage/filestore/filestore_error.hpp"
 #include "testutil/outcome.hpp"
 #include "testutil/storage/base_fs_test.hpp"
 
diff --git a/test/core/storage/hamt/hamt_test.cpp b/test/core/storage/hamt/hamt_test.cpp
index 9fbce29905..6036b1a916 100644
--- a/test/core/storage/hamt/hamt_test.cpp
+++ b/test/core/storage/hamt/hamt_test.cpp
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/hamt/hamt.hpp"
+#include "filecoin/storage/hamt/hamt.hpp"
 
 #include <gtest/gtest.h>
-#include "codec/cbor/cbor.hpp"
-#include "common/which.hpp"
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/common/which.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/cbor.hpp"
 
 using fc::codec::cbor::encode;
diff --git a/test/core/storage/ipfs/datastore_integration_test.cpp b/test/core/storage/ipfs/datastore_integration_test.cpp
index 01a5a00008..98b9bc9888 100644
--- a/test/core/storage/ipfs/datastore_integration_test.cpp
+++ b/test/core/storage/ipfs/datastore_integration_test.cpp
@@ -8,7 +8,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/uuid/uuid.hpp>
 
-#include "storage/ipfs/impl/datastore_leveldb.hpp"
+#include "filecoin/storage/ipfs/impl/datastore_leveldb.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
 
diff --git a/test/core/storage/ipfs/in_memory_ipfs_datastore_test.cpp b/test/core/storage/ipfs/in_memory_ipfs_datastore_test.cpp
index 264a9f3807..ff6963033c 100644
--- a/test/core/storage/ipfs/in_memory_ipfs_datastore_test.cpp
+++ b/test/core/storage/ipfs/in_memory_ipfs_datastore_test.cpp
@@ -5,7 +5,7 @@
 
 #include <gtest/gtest.h>
 
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
 
diff --git a/test/core/storage/ipfs/ipfs_block_service_test.cpp b/test/core/storage/ipfs/ipfs_block_service_test.cpp
index 3353f126e2..67004a4c3e 100644
--- a/test/core/storage/ipfs/ipfs_block_service_test.cpp
+++ b/test/core/storage/ipfs/ipfs_block_service_test.cpp
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipfs/impl/ipfs_block_service.hpp"
+#include "filecoin/storage/ipfs/impl/ipfs_block_service.hpp"
 
 #include <memory>
 
 #include <gtest/gtest.h>
-#include "common/outcome.hpp"
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
-#include "storage/ipld/ipld_block.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/storage/ipld/ipld_block.hpp"
 #include "testutil/outcome.hpp"
 
 using fc::CID;
diff --git a/test/core/storage/ipfs/merkledag/ipfs_merkledag_dataset.hpp b/test/core/storage/ipfs/merkledag/ipfs_merkledag_dataset.hpp
index 233cf2959f..57156ac717 100644
--- a/test/core/storage/ipfs/merkledag/ipfs_merkledag_dataset.hpp
+++ b/test/core/storage/ipfs/merkledag/ipfs_merkledag_dataset.hpp
@@ -7,7 +7,7 @@
 #define CORE_STORAGE_IPFS_MERKLEDAG_NODE_LIBRARY
 
 #include <libp2p/multi/content_identifier_codec.hpp>
-#include "storage/ipld/impl/ipld_node_impl.hpp"
+#include "filecoin/storage/ipld/impl/ipld_node_impl.hpp"
 
 namespace dataset {
   using fc::storage::ipld::IPLDNode;
diff --git a/test/core/storage/ipfs/merkledag/ipfs_merkledag_service_test.cpp b/test/core/storage/ipfs/merkledag/ipfs_merkledag_service_test.cpp
index 5227713484..70fd93848a 100644
--- a/test/core/storage/ipfs/merkledag/ipfs_merkledag_service_test.cpp
+++ b/test/core/storage/ipfs/merkledag/ipfs_merkledag_service_test.cpp
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/ipfs/merkledag/impl/merkledag_service_impl.hpp"
+#include "filecoin/storage/ipfs/merkledag/impl/merkledag_service_impl.hpp"
 
 #include <gtest/gtest.h>
 #include <libp2p/multi/content_identifier_codec.hpp>
 #include <testutil/outcome.hpp>
-#include "core/storage/ipfs/merkledag/ipfs_merkledag_dataset.hpp"
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
-#include "storage/ipfs/impl/ipfs_block_service.hpp"
+#include "ipfs_merkledag_dataset.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/storage/ipfs/impl/ipfs_block_service.hpp"
 
 using namespace fc::storage::ipfs;
 using namespace fc::storage::ipld;
diff --git a/test/core/storage/keystore/filesystem_keystore_test.cpp b/test/core/storage/keystore/filesystem_keystore_test.cpp
index 55cf0fb1d8..b367cd0375 100644
--- a/test/core/storage/keystore/filesystem_keystore_test.cpp
+++ b/test/core/storage/keystore/filesystem_keystore_test.cpp
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/keystore/impl/filesystem/filesystem_keystore.hpp"
+#include "filecoin/storage/keystore/impl/filesystem/filesystem_keystore.hpp"
 
 #include <gtest/gtest.h>
-#include "crypto/blake2/blake2b.h"
-#include "crypto/bls/impl/bls_provider_impl.hpp"
-#include "crypto/secp256k1/secp256k1_provider.hpp"
-#include "primitives/address/address_codec.hpp"
+#include "filecoin/crypto/blake2/blake2b.h"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/crypto/secp256k1/secp256k1_provider.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
 #include "testutil/outcome.hpp"
 #include "testutil/storage/base_fs_test.hpp"
 
diff --git a/test/core/storage/keystore/in_memory_keystore_test.cpp b/test/core/storage/keystore/in_memory_keystore_test.cpp
index da722ce9e5..1f346cd146 100644
--- a/test/core/storage/keystore/in_memory_keystore_test.cpp
+++ b/test/core/storage/keystore/in_memory_keystore_test.cpp
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/keystore/impl/in_memory/in_memory_keystore.hpp"
+#include "filecoin/storage/keystore/impl/in_memory/in_memory_keystore.hpp"
 
 #include <gtest/gtest.h>
 
-#include "crypto/blake2/blake2b.h"
-#include "crypto/bls/impl/bls_provider_impl.hpp"
-#include "crypto/secp256k1/secp256k1_provider.hpp"
-#include "primitives/address/address_codec.hpp"
+#include "filecoin/crypto/blake2/blake2b.h"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/crypto/secp256k1/secp256k1_provider.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
 #include "testutil/outcome.hpp"
 
 using fc::crypto::bls::BlsProvider;
diff --git a/test/core/storage/leveldb/leveldb_fs_test.cpp b/test/core/storage/leveldb/leveldb_fs_test.cpp
index 40dd1bc09b..71ee8ddfa4 100644
--- a/test/core/storage/leveldb/leveldb_fs_test.cpp
+++ b/test/core/storage/leveldb/leveldb_fs_test.cpp
@@ -7,8 +7,8 @@
 
 #include <boost/filesystem.hpp>
 
-#include "storage/leveldb/leveldb.hpp"
-#include "storage/leveldb/leveldb_error.hpp"
+#include "filecoin/storage/leveldb/leveldb.hpp"
+#include "filecoin/storage/leveldb/leveldb_error.hpp"
 #include "testutil/outcome.hpp"
 #include "testutil/storage/base_fs_test.hpp"
 
diff --git a/test/core/storage/leveldb/leveldb_integration_test.cpp b/test/core/storage/leveldb/leveldb_integration_test.cpp
index b44f260fa0..fb03b22b6b 100644
--- a/test/core/storage/leveldb/leveldb_integration_test.cpp
+++ b/test/core/storage/leveldb/leveldb_integration_test.cpp
@@ -9,8 +9,8 @@
 #include <boost/filesystem.hpp>
 #include <exception>
 
-#include "storage/leveldb/leveldb.hpp"
-#include "storage/leveldb/leveldb_error.hpp"
+#include "filecoin/storage/leveldb/leveldb.hpp"
+#include "filecoin/storage/leveldb/leveldb_error.hpp"
 #include "testutil/outcome.hpp"
 #include "testutil/storage/base_leveldb_test.hpp"
 
diff --git a/test/core/storage/repository/filesystem_repository_test.cpp b/test/core/storage/repository/filesystem_repository_test.cpp
index c125f05576..b15538b832 100644
--- a/test/core/storage/repository/filesystem_repository_test.cpp
+++ b/test/core/storage/repository/filesystem_repository_test.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "storage/repository/impl/filesystem_repository.hpp"
+#include "filecoin/storage/repository/impl/filesystem_repository.hpp"
 
-#include "crypto/bls/impl/bls_provider_impl.hpp"
-#include "storage/ipfs/datastore.hpp"
-#include "storage/repository/repository_error.hpp"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
+#include "filecoin/storage/repository/repository_error.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
 #include "testutil/storage/base_fs_test.hpp"
diff --git a/test/core/vm/actor/actor_test.cpp b/test/core/vm/actor/actor_test.cpp
index c295e3c2c3..63a3a487b6 100644
--- a/test/core/vm/actor/actor_test.cpp
+++ b/test/core/vm/actor/actor_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/actor.hpp"
+#include "filecoin/vm/actor/actor.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/cbor.hpp"
diff --git a/test/core/vm/actor/builtin/account/account_actor_test.cpp b/test/core/vm/actor/builtin/account/account_actor_test.cpp
index a0364f9261..216d578947 100644
--- a/test/core/vm/actor/builtin/account/account_actor_test.cpp
+++ b/test/core/vm/actor/builtin/account/account_actor_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/account/account_actor.hpp"
+#include "filecoin/vm/actor/builtin/account/account_actor.hpp"
 
 #include "testutil/init_actor.hpp"
 
diff --git a/test/core/vm/actor/builtin/cron/cron_actor_test.cpp b/test/core/vm/actor/builtin/cron/cron_actor_test.cpp
index b8843f96db..9fd9033438 100644
--- a/test/core/vm/actor/builtin/cron/cron_actor_test.cpp
+++ b/test/core/vm/actor/builtin/cron/cron_actor_test.cpp
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/cron/cron_actor.hpp"
+#include "filecoin/vm/actor/builtin/cron/cron_actor.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/mocks/vm/runtime/runtime_mock.hpp"
 #include "testutil/outcome.hpp"
-#include "vm/actor/actor.hpp"
-#include "vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
+#include "filecoin/vm/actor/actor.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
 
 using namespace fc::vm;
 using fc::vm::actor::MethodNumber;
diff --git a/test/core/vm/actor/builtin/init/init_actor_test.cpp b/test/core/vm/actor/builtin/init/init_actor_test.cpp
index 395d2133c4..75f0d9b77f 100644
--- a/test/core/vm/actor/builtin/init/init_actor_test.cpp
+++ b/test/core/vm/actor/builtin/init/init_actor_test.cpp
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/init/init_actor.hpp"
+#include "filecoin/vm/actor/builtin/init/init_actor.hpp"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include "primitives/address/address_codec.hpp"
-#include "storage/hamt/hamt.hpp"
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
+#include "filecoin/storage/hamt/hamt.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/cbor.hpp"
 #include "testutil/init_actor.hpp"
 #include "testutil/mocks/vm/runtime/runtime_mock.hpp"
diff --git a/test/core/vm/actor/builtin/miner/miner_actor_test.cpp b/test/core/vm/actor/builtin/miner/miner_actor_test.cpp
index d9ab644aa1..6a62f51539 100644
--- a/test/core/vm/actor/builtin/miner/miner_actor_test.cpp
+++ b/test/core/vm/actor/builtin/miner/miner_actor_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/miner/miner_actor.hpp"
+#include "filecoin/vm/actor/builtin/miner/miner_actor.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/cbor.hpp"
diff --git a/test/core/vm/actor/builtin/multisig_actor/multisig_actor_test.cpp b/test/core/vm/actor/builtin/multisig_actor/multisig_actor_test.cpp
index 7e3e0a5cc3..5ca0d4dac6 100644
--- a/test/core/vm/actor/builtin/multisig_actor/multisig_actor_test.cpp
+++ b/test/core/vm/actor/builtin/multisig_actor/multisig_actor_test.cpp
@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/multisig/multisig_actor.hpp"
+#include "filecoin/vm/actor/builtin/multisig/multisig_actor.hpp"
 
 #include <gtest/gtest.h>
-#include "primitives/address/address.hpp"
+#include "filecoin/primitives/address/address.hpp"
 #include "testutil/cbor.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/mocks/storage/ipfs/ipfs_datastore_mock.hpp"
 #include "testutil/mocks/vm/runtime/runtime_mock.hpp"
 #include "testutil/outcome.hpp"
-#include "vm/actor/actor_method.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
 
 using fc::CID;
 using fc::common::Buffer;
diff --git a/test/core/vm/actor/builtin/payment_channel/payment_channel_actor_test.cpp b/test/core/vm/actor/builtin/payment_channel/payment_channel_actor_test.cpp
index 2d36f67040..fea175b7a8 100644
--- a/test/core/vm/actor/builtin/payment_channel/payment_channel_actor_test.cpp
+++ b/test/core/vm/actor/builtin/payment_channel/payment_channel_actor_test.cpp
@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/payment_channel/payment_channel_actor.hpp"
+#include "filecoin/vm/actor/builtin/payment_channel/payment_channel_actor.hpp"
 
 #include "gtest/gtest.h"
-#include "primitives/address/address.hpp"
+#include "filecoin/primitives/address/address.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/mocks/storage/ipfs/ipfs_datastore_mock.hpp"
 #include "testutil/mocks/vm/runtime/runtime_mock.hpp"
 #include "testutil/outcome.hpp"
-#include "vm/actor/actor_method.hpp"
-#include "vm/actor/builtin/payment_channel/payment_channel_actor_state.hpp"
+#include "filecoin/vm/actor/actor_method.hpp"
+#include "filecoin/vm/actor/builtin/payment_channel/payment_channel_actor_state.hpp"
 
 using fc::primitives::address::Address;
 using fc::storage::ipfs::MockIpfsDatastore;
diff --git a/test/core/vm/actor/builtin/storage_power/storage_power_actor_state_test.cpp b/test/core/vm/actor/builtin/storage_power/storage_power_actor_state_test.cpp
index 25dd25b886..dbc3029559 100644
--- a/test/core/vm/actor/builtin/storage_power/storage_power_actor_state_test.cpp
+++ b/test/core/vm/actor/builtin/storage_power/storage_power_actor_state_test.cpp
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/storage_power/storage_power_actor_state.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/storage_power_actor_state.hpp"
 
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/mocks/crypto/randomness/randomness_provider_mock.hpp"
 #include "testutil/mocks/vm/indices/indices_mock.hpp"
 #include "testutil/outcome.hpp"
-#include "vm/exit_code/exit_code.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
 
 using fc::CID;
 using fc::adt::BalanceTableHamt;
diff --git a/test/core/vm/actor/builtin/storage_power/storage_power_actor_test.cpp b/test/core/vm/actor/builtin/storage_power/storage_power_actor_test.cpp
index d2eb67716d..32e89c4323 100644
--- a/test/core/vm/actor/builtin/storage_power/storage_power_actor_test.cpp
+++ b/test/core/vm/actor/builtin/storage_power/storage_power_actor_test.cpp
@@ -3,17 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
 
 #include <gtest/gtest.h>
-#include "codec/cbor/cbor.hpp"
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/mocks/vm/runtime/runtime_mock.hpp"
 #include "testutil/outcome.hpp"
-#include "vm/actor/builtin/init/init_actor.hpp"
-#include "vm/actor/builtin/miner/miner_actor.hpp"
-#include "vm/actor/builtin/storage_power/storage_power_actor_state.hpp"
+#include "filecoin/vm/actor/builtin/init/init_actor.hpp"
+#include "filecoin/vm/actor/builtin/miner/miner_actor.hpp"
+#include "filecoin/vm/actor/builtin/storage_power/storage_power_actor_state.hpp"
 
 using fc::CID;
 using fc::common::Buffer;
diff --git a/test/core/vm/actor/invoker_test.cpp b/test/core/vm/actor/invoker_test.cpp
index d701fec17d..27bb499fa4 100644
--- a/test/core/vm/actor/invoker_test.cpp
+++ b/test/core/vm/actor/invoker_test.cpp
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/impl/invoker_impl.hpp"
+#include "filecoin/vm/actor/impl/invoker_impl.hpp"
 
 #include <gtest/gtest.h>
 #include "testutil/cbor.hpp"
 #include "testutil/mocks/vm/runtime/runtime_mock.hpp"
 #include "testutil/outcome.hpp"
-#include "vm/actor/builtin/cron/cron_actor.hpp"
+#include "filecoin/vm/actor/builtin/cron/cron_actor.hpp"
 
 using fc::vm::VMExitCode;
 using fc::vm::actor::MethodParams;
diff --git a/test/core/vm/exit_code/exit_code_test.cpp b/test/core/vm/exit_code/exit_code_test.cpp
index 93bcf676e8..78501d0eb9 100644
--- a/test/core/vm/exit_code/exit_code_test.cpp
+++ b/test/core/vm/exit_code/exit_code_test.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/exit_code/exit_code.hpp"
+#include "filecoin/vm/exit_code/exit_code.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/core/vm/message/message_test.cpp b/test/core/vm/message/message_test.cpp
index 76c78c7830..a130b5b32c 100644
--- a/test/core/vm/message/message_test.cpp
+++ b/test/core/vm/message/message_test.cpp
@@ -7,14 +7,14 @@
 
 #include <map>
 
-#include "crypto/bls/impl/bls_provider_impl.hpp"
-#include "crypto/secp256k1/secp256k1_provider.hpp"
-#include "storage/keystore/impl/in_memory/in_memory_keystore.hpp"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/crypto/secp256k1/secp256k1_provider.hpp"
+#include "filecoin/storage/keystore/impl/in_memory/in_memory_keystore.hpp"
 #include "testutil/cbor.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
-#include "vm/message/impl/message_signer_impl.hpp"
-#include "vm/message/message_util.hpp"
+#include "filecoin/vm/message/impl/message_signer_impl.hpp"
+#include "filecoin/vm/message/message_util.hpp"
 
 using fc::crypto::bls::BlsProvider;
 using fc::crypto::bls::BlsProviderImpl;
diff --git a/test/core/vm/runtime/runtime_test.cpp b/test/core/vm/runtime/runtime_test.cpp
index 5da7f9fbdb..83b9979221 100644
--- a/test/core/vm/runtime/runtime_test.cpp
+++ b/test/core/vm/runtime/runtime_test.cpp
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/runtime/impl/runtime_impl.hpp"
+#include "filecoin/vm/runtime/impl/runtime_impl.hpp"
 
 #include <gtest/gtest.h>
-#include "crypto/randomness/randomness_types.hpp"
-#include "primitives/address/address.hpp"
-#include "primitives/big_int.hpp"
+#include "filecoin/crypto/randomness/randomness_types.hpp"
+#include "filecoin/primitives/address/address.hpp"
+#include "filecoin/primitives/big_int.hpp"
 #include "testutil/cbor.hpp"
 #include "testutil/mocks/crypto/randomness/randomness_provider_mock.hpp"
 #include "testutil/mocks/storage/ipfs/ipfs_datastore_mock.hpp"
@@ -16,8 +16,8 @@
 #include "testutil/mocks/vm/indices/indices_mock.hpp"
 #include "testutil/mocks/vm/state/state_tree_mock.hpp"
 #include "testutil/outcome.hpp"
-#include "vm/message/message.hpp"
-#include "vm/runtime/runtime_error.hpp"
+#include "filecoin/vm/message/message.hpp"
+#include "filecoin/vm/runtime/runtime_error.hpp"
 
 using fc::crypto::randomness::ChainEpoch;
 using fc::crypto::randomness::MockRandomnessProvider;
diff --git a/test/core/vm/state/state_tree_test.cpp b/test/core/vm/state/state_tree_test.cpp
index dea73503af..2675d1eb9f 100644
--- a/test/core/vm/state/state_tree_test.cpp
+++ b/test/core/vm/state/state_tree_test.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/state/impl/state_tree_impl.hpp"
+#include "filecoin/vm/state/impl/state_tree_impl.hpp"
 
 #include <gtest/gtest.h>
-#include "primitives/address/address_codec.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
 #include "testutil/init_actor.hpp"
 
 using fc::primitives::BigInt;
diff --git a/test/testutil/cbor.hpp b/test/testutil/cbor.hpp
index 49d5fd369d..dadff74d6a 100644
--- a/test/testutil/cbor.hpp
+++ b/test/testutil/cbor.hpp
@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_TEST_TESTUTIL_CBOR_HPP
 #define CPP_FILECOIN_TEST_TESTUTIL_CBOR_HPP
 
-#include "codec/cbor/cbor.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
 
diff --git a/test/testutil/init_actor.hpp b/test/testutil/init_actor.hpp
index 9cfb125acb..95a4591ada 100644
--- a/test/testutil/init_actor.hpp
+++ b/test/testutil/init_actor.hpp
@@ -2,10 +2,10 @@
 #define CPP_FILECOIN_TEST_TESTUTIL_INIT_ACTOR_HPP
 
 #include <gtest/gtest.h>
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 #include "testutil/cbor.hpp"
-#include "vm/actor/builtin/init/init_actor.hpp"
-#include "vm/state/impl/state_tree_impl.hpp"
+#include "filecoin/vm/actor/builtin/init/init_actor.hpp"
+#include "filecoin/vm/state/impl/state_tree_impl.hpp"
 
 /// Sets up init actor state
 std::shared_ptr<fc::vm::state::StateTree> setupInitActor(
diff --git a/test/testutil/literals.hpp b/test/testutil/literals.hpp
index e803939bf6..99ea0ef652 100644
--- a/test/testutil/literals.hpp
+++ b/test/testutil/literals.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_TEST_TESTUTIL_LITERALS_HPP
 #define CPP_FILECOIN_TEST_TESTUTIL_LITERALS_HPP
 
-#include "common/blob.hpp"
-#include "common/hexutil.hpp"
+#include "filecoin/common/blob.hpp"
+#include "filecoin/common/hexutil.hpp"
 
 inline std::vector<uint8_t> operator""_unhex(const char *c, size_t s) {
   return fc::common::unhex(std::string_view(c, s)).value();
diff --git a/test/testutil/mocks/blockchain/message_pool/message_storage_mock.hpp b/test/testutil/mocks/blockchain/message_pool/message_storage_mock.hpp
index 86001c2ff3..48d462dd84 100644
--- a/test/testutil/mocks/blockchain/message_pool/message_storage_mock.hpp
+++ b/test/testutil/mocks/blockchain/message_pool/message_storage_mock.hpp
@@ -8,7 +8,7 @@
 
 #include <gmock/gmock.h>
 
-#include "blockchain/message_pool/message_storage.hpp"
+#include "filecoin/blockchain/message_pool/message_storage.hpp"
 
 namespace fc::blockchain::message_pool {
   class MessageStorageMock : public MessageStorage {
diff --git a/test/testutil/mocks/blockchain/weight_calculator_mock.hpp b/test/testutil/mocks/blockchain/weight_calculator_mock.hpp
index 3a66eabfa7..15474c27a2 100644
--- a/test/testutil/mocks/blockchain/weight_calculator_mock.hpp
+++ b/test/testutil/mocks/blockchain/weight_calculator_mock.hpp
@@ -8,7 +8,7 @@
 
 #include <gmock/gmock.h>
 
-#include "blockchain/weight_calculator.hpp"
+#include "filecoin/blockchain/weight_calculator.hpp"
 
 namespace fc::blockchain::weight {
   class WeightCalculatorMock : public WeightCalculator {
diff --git a/test/testutil/mocks/clock/utc_clock_mock.hpp b/test/testutil/mocks/clock/utc_clock_mock.hpp
index d085aa721c..7774e2c120 100644
--- a/test/testutil/mocks/clock/utc_clock_mock.hpp
+++ b/test/testutil/mocks/clock/utc_clock_mock.hpp
@@ -8,7 +8,7 @@
 
 #include <gmock/gmock.h>
 
-#include "clock/utc_clock.hpp"
+#include "filecoin/clock/utc_clock.hpp"
 
 using fc::clock::UTCClock;
 using fc::clock::Time;
diff --git a/test/testutil/mocks/crypto/bls/bls_provider_mock.hpp b/test/testutil/mocks/crypto/bls/bls_provider_mock.hpp
index d407c6cd31..28df6ff1a0 100644
--- a/test/testutil/mocks/crypto/bls/bls_provider_mock.hpp
+++ b/test/testutil/mocks/crypto/bls/bls_provider_mock.hpp
@@ -7,7 +7,7 @@
 #define CPP_FILECOIN_TEST_TESTUTIL_CRYPTO_BLS_PROVIDER_MOCK_HPP
 
 #include <gmock/gmock.h>
-#include "crypto/bls/bls_provider.hpp"
+#include "filecoin/crypto/bls/bls_provider.hpp"
 
 namespace fc::crypto::bls {
   class BlsProviderMock : public BlsProvider {
diff --git a/test/testutil/mocks/crypto/randomness/randomness_provider_mock.hpp b/test/testutil/mocks/crypto/randomness/randomness_provider_mock.hpp
index 79c954f7e3..cc5b9694f5 100644
--- a/test/testutil/mocks/crypto/randomness/randomness_provider_mock.hpp
+++ b/test/testutil/mocks/crypto/randomness/randomness_provider_mock.hpp
@@ -7,7 +7,7 @@
 #define CPP_FILECOIN_CORE_CRYPTO_RANDOMNESS_RANDOMNESS_PROVIDER_MOCK_HPP
 
 #include <gmock/gmock.h>
-#include "crypto/randomness/randomness_provider.hpp"
+#include "filecoin/crypto/randomness/randomness_provider.hpp"
 
 namespace fc::crypto::randomness {
 
diff --git a/test/testutil/mocks/storage/chain/chain_data_store_mock.hpp b/test/testutil/mocks/storage/chain/chain_data_store_mock.hpp
index cf5f446d7c..c3e3baf336 100644
--- a/test/testutil/mocks/storage/chain/chain_data_store_mock.hpp
+++ b/test/testutil/mocks/storage/chain/chain_data_store_mock.hpp
@@ -8,7 +8,7 @@
 
 #include <gmock/gmock.h>
 
-#include "storage/chain/chain_data_store.hpp"
+#include "filecoin/storage/chain/chain_data_store.hpp"
 
 namespace fc::storage::blockchain {
   class ChainDataStoreMock: public ChainDataStore {
diff --git a/test/testutil/mocks/storage/ipfs/ipfs_datastore_mock.hpp b/test/testutil/mocks/storage/ipfs/ipfs_datastore_mock.hpp
index 39d6905ea5..c286bb1069 100644
--- a/test/testutil/mocks/storage/ipfs/ipfs_datastore_mock.hpp
+++ b/test/testutil/mocks/storage/ipfs/ipfs_datastore_mock.hpp
@@ -8,7 +8,7 @@
 
 #include <gmock/gmock.h>
 
-#include "storage/ipfs/datastore.hpp"
+#include "filecoin/storage/ipfs/datastore.hpp"
 
 namespace fc::storage::ipfs {
 
diff --git a/test/testutil/mocks/vm/actor/invoker_mock.hpp b/test/testutil/mocks/vm/actor/invoker_mock.hpp
index 976f0bf5b5..c10548b149 100644
--- a/test/testutil/mocks/vm/actor/invoker_mock.hpp
+++ b/test/testutil/mocks/vm/actor/invoker_mock.hpp
@@ -7,7 +7,7 @@
 #define CPP_FILECOIN_CORE_VM_ACTOR_INVOKER_MOCK_HPP
 
 #include <gmock/gmock.h>
-#include "vm/actor/invoker.hpp"
+#include "filecoin/vm/actor/invoker.hpp"
 
 namespace fc::vm::actor {
 
diff --git a/test/testutil/mocks/vm/indices/indices_mock.hpp b/test/testutil/mocks/vm/indices/indices_mock.hpp
index 928e802807..cf849f08bd 100644
--- a/test/testutil/mocks/vm/indices/indices_mock.hpp
+++ b/test/testutil/mocks/vm/indices/indices_mock.hpp
@@ -7,7 +7,7 @@
 #define CPP_FILECOIN_VM_INDICES_INDICES_MOCK_HPP
 
 #include <gmock/gmock.h>
-#include "vm/indices/indices.hpp"
+#include "filecoin/vm/indices/indices.hpp"
 
 namespace fc::vm::indices {
 
diff --git a/test/testutil/mocks/vm/interpreter/interpreter_mock.hpp b/test/testutil/mocks/vm/interpreter/interpreter_mock.hpp
index 30cf77a094..ce309d5a7d 100644
--- a/test/testutil/mocks/vm/interpreter/interpreter_mock.hpp
+++ b/test/testutil/mocks/vm/interpreter/interpreter_mock.hpp
@@ -8,7 +8,7 @@
 
 #include <gmock/gmock.h>
 
-#include "vm/interpreter/impl/interpreter_impl.hpp"
+#include "filecoin/vm/interpreter/impl/interpreter_impl.hpp"
 
 namespace fc::vm::interpreter {
   class InterpreterMock : public Interpreter {
diff --git a/test/testutil/mocks/vm/runtime/runtime_mock.hpp b/test/testutil/mocks/vm/runtime/runtime_mock.hpp
index 290f5866fa..37023b29ba 100644
--- a/test/testutil/mocks/vm/runtime/runtime_mock.hpp
+++ b/test/testutil/mocks/vm/runtime/runtime_mock.hpp
@@ -9,7 +9,7 @@
 #include <gmock/gmock.h>
 
 #include "testutil/outcome.hpp"
-#include "vm/runtime/runtime.hpp"
+#include "filecoin/vm/runtime/runtime.hpp"
 
 namespace fc::vm::runtime {
 
diff --git a/test/testutil/mocks/vm/state/state_tree_mock.hpp b/test/testutil/mocks/vm/state/state_tree_mock.hpp
index 3f64bb993a..efa9b66d55 100644
--- a/test/testutil/mocks/vm/state/state_tree_mock.hpp
+++ b/test/testutil/mocks/vm/state/state_tree_mock.hpp
@@ -7,7 +7,7 @@
 #define CPP_FILECOIN_CORE_VM_STATE_STATE_TREE_MOCK_HPP
 
 #include <gmock/gmock.h>
-#include "vm/state/state_tree.hpp"
+#include "filecoin/vm/state/state_tree.hpp"
 
 namespace fc::vm::state {
 
diff --git a/test/testutil/outcome.hpp b/test/testutil/outcome.hpp
index 569f7181b4..2219426f4c 100644
--- a/test/testutil/outcome.hpp
+++ b/test/testutil/outcome.hpp
@@ -7,8 +7,8 @@
 #define CPP_FILECOIN_GTEST_OUTCOME_UTIL_HPP
 
 #include <gtest/gtest.h>
-#include "common/outcome.hpp"
-#include "common/visitor.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/common/visitor.hpp"
 
 #define PP_CAT(a, b) PP_CAT_I(a, b)
 #define PP_CAT_I(a, b) PP_CAT_II(~, a##b)
diff --git a/test/testutil/primitives/ticket/printer.hpp b/test/testutil/primitives/ticket/printer.hpp
index 1f48a8a323..51b0c027ed 100644
--- a/test/testutil/primitives/ticket/printer.hpp
+++ b/test/testutil/primitives/ticket/printer.hpp
@@ -9,9 +9,9 @@
 #include <iosfwd>
 
 #include <boost/algorithm/string.hpp>
-#include "common/hexutil.hpp"
-#include "primitives/ticket/epost_ticket.hpp"
-#include "primitives/ticket/ticket.hpp"
+#include "filecoin/common/hexutil.hpp"
+#include "filecoin/primitives/ticket/epost_ticket.hpp"
+#include "filecoin/primitives/ticket/ticket.hpp"
 
 /**
  * @brief human-readable print Ticket
diff --git a/test/testutil/primitives/ticket/ticket_generator.hpp b/test/testutil/primitives/ticket/ticket_generator.hpp
index f2417fe8f6..8aba3e2e22 100644
--- a/test/testutil/primitives/ticket/ticket_generator.hpp
+++ b/test/testutil/primitives/ticket/ticket_generator.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_TEST_TESTUTIL_PRIMITIVES_TICKET_UTILS_HPP
 #define CPP_FILECOIN_TEST_TESTUTIL_PRIMITIVES_TICKET_UTILS_HPP
 
-#include "primitives/ticket/epost_ticket.hpp"
-#include "primitives/ticket/ticket.hpp"
+#include "filecoin/primitives/ticket/epost_ticket.hpp"
+#include "filecoin/primitives/ticket/ticket.hpp"
 
 #include <libp2p/crypto/random_generator/boost_generator.hpp>
 
diff --git a/test/testutil/storage/base_fs_test.hpp b/test/testutil/storage/base_fs_test.hpp
index 6bc6d9a3f6..02a6548efd 100644
--- a/test/testutil/storage/base_fs_test.hpp
+++ b/test/testutil/storage/base_fs_test.hpp
@@ -10,7 +10,7 @@
 
 #include <boost/filesystem.hpp>
 
-#include "common/logger.hpp"
+#include "filecoin/common/logger.hpp"
 
 // intentionally here, so users can use fs shortcut
 namespace fs = boost::filesystem;
diff --git a/test/testutil/storage/base_leveldb_test.hpp b/test/testutil/storage/base_leveldb_test.hpp
index 30ddfc0575..a056dae13f 100644
--- a/test/testutil/storage/base_leveldb_test.hpp
+++ b/test/testutil/storage/base_leveldb_test.hpp
@@ -8,7 +8,7 @@
 
 #include "testutil/storage/base_fs_test.hpp"
 
-#include "storage/leveldb/leveldb.hpp"
+#include "filecoin/storage/leveldb/leveldb.hpp"
 
 namespace test {
 
diff --git a/test/testutil/storage/std_list_adapter.hpp b/test/testutil/storage/std_list_adapter.hpp
index e5a9af538c..1fddbe0362 100644
--- a/test/testutil/storage/std_list_adapter.hpp
+++ b/test/testutil/storage/std_list_adapter.hpp
@@ -8,8 +8,8 @@
 
 #include <list>
 
-#include "storage/face/generic_iterator.hpp"
-#include "storage/face/generic_list.hpp"
+#include "filecoin/storage/face/generic_iterator.hpp"
+#include "filecoin/storage/face/generic_list.hpp"
 
 namespace test {
 
diff --git a/test/testutil/vm/message/message_test_util.cpp b/test/testutil/vm/message/message_test_util.cpp
index 5547165b99..dedd471fd9 100644
--- a/test/testutil/vm/message/message_test_util.cpp
+++ b/test/testutil/vm/message/message_test_util.cpp
@@ -5,8 +5,8 @@
 
 #include "testutil/vm/message/message_test_util.hpp"
 
-#include "crypto/bls/impl/bls_provider_impl.hpp"
-#include "vm/message/message_util.hpp"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/vm/message/message_util.hpp"
 
 using fc::crypto::bls::BlsProviderImpl;
 using fc::vm::message::cid;
diff --git a/test/testutil/vm/message/message_test_util.hpp b/test/testutil/vm/message/message_test_util.hpp
index c7cf0e8448..ac8e8dba8d 100644
--- a/test/testutil/vm/message/message_test_util.hpp
+++ b/test/testutil/vm/message/message_test_util.hpp
@@ -6,8 +6,8 @@
 #ifndef CPP_FILECOIN_TESTUTIL_VM_MESSAGE_MESSAGETESTUTIL_HPP
 #define CPP_FILECOIN_TESTUTIL_VM_MESSAGE_MESSAGETESTUTIL_HPP
 
-#include "common/outcome.hpp"
-#include "vm/message/message.hpp"
+#include "filecoin/common/outcome.hpp"
+#include "filecoin/vm/message/message.hpp"
 
 using fc::vm::message::SignedMessage;
 using fc::vm::message::UnsignedMessage;