diff --git a/.gitignore b/.gitignore
index 426ba9ac6..7640b7b97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,13 @@ TAGS
 
 # LCP generated C++ & Cap'n Proto files
 *.lcp.cpp
+
+# TODO delete later
+src/storage/distributed/concurrent_id_mapper_rpc_messages.capnp
+src/storage/distributed/concurrent_id_mapper_rpc_messages.hpp
+#####
+
+
 src/database/distributed/counters_rpc_messages.capnp
 src/database/distributed/counters_rpc_messages.hpp
 src/database/distributed/serialization.capnp
@@ -78,7 +85,7 @@ src/query/plan/distributed_ops.hpp
 src/query/plan/operator.hpp
 src/stats/stats_rpc_messages.capnp
 src/stats/stats_rpc_messages.hpp
-src/storage/distributed/concurrent_id_mapper_rpc_messages.capnp
-src/storage/distributed/concurrent_id_mapper_rpc_messages.hpp
+src/storage/distributed/rpc/concurrent_id_mapper_rpc_messages.capnp
+src/storage/distributed/rpc/concurrent_id_mapper_rpc_messages.hpp
 src/transactions/distributed/engine_rpc_messages.capnp
 src/transactions/distributed/engine_rpc_messages.hpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5094d6c3a..e1c6a18e1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,9 +42,9 @@ set(mg_single_node_sources
     query/repl.cpp
     query/typed_value.cpp
     storage/single_node/edge_accessor.cpp
-    storage/locking/record_lock.cpp
-    storage/common/property_value.cpp
-    storage/common/property_value_store.cpp
+    storage/common/locking/record_lock.cpp
+    storage/common/types/property_value.cpp
+    storage/common/types/property_value_store.cpp
     storage/single_node/record_accessor.cpp
     storage/single_node/vertex_accessor.cpp
     transactions/single_node/engine.cpp
@@ -146,13 +146,13 @@ set(mg_distributed_sources
     query/repl.cpp
     query/serialization.cpp
     query/typed_value.cpp
-    storage/common/property_value.cpp
-    storage/common/property_value_store.cpp
+    storage/common/locking/record_lock.cpp
+    storage/common/types/property_value.cpp
+    storage/common/types/property_value_store.cpp
     storage/distributed/edge_accessor.cpp
     storage/distributed/record_accessor.cpp
-    storage/distributed/serialization.cpp
+    storage/distributed/rpc/serialization.cpp
     storage/distributed/vertex_accessor.cpp
-    storage/locking/record_lock.cpp
     memgraph_init.cpp
     transactions/distributed/engine_single_node.cpp
 )
@@ -204,8 +204,8 @@ add_lcp_distributed(query/plan/distributed_ops.lcp CAPNP_SCHEMA @0xe5cae8d045d30
         DEPENDS query/plan/operator.lcp)
 add_capnp(query/plan/distributed_ops.capnp)
 
-add_lcp_distributed(storage/distributed/concurrent_id_mapper_rpc_messages.lcp CAPNP_SCHEMA @0xa6068dae93d225dd)
-add_capnp(storage/distributed/concurrent_id_mapper_rpc_messages.capnp)
+add_lcp_distributed(storage/distributed/rpc/concurrent_id_mapper_rpc_messages.lcp CAPNP_SCHEMA @0xa6068dae93d225dd)
+add_capnp(storage/distributed/rpc/concurrent_id_mapper_rpc_messages.capnp)
 add_lcp_distributed(transactions/distributed/engine_rpc_messages.lcp CAPNP_SCHEMA @0xde02b7c49180cad5
         DEPENDS transactions/distributed/serialization.lcp)
 add_capnp(transactions/distributed/engine_rpc_messages.capnp)
@@ -218,7 +218,7 @@ add_capnp(communication/rpc/messages.capnp)
 add_capnp(durability/distributed/serialization.capnp)
 add_capnp(query/frontend/semantic/symbol.capnp)
 add_capnp(query/serialization.capnp)
-add_capnp(storage/distributed/serialization.capnp)
+add_capnp(storage/distributed/rpc/serialization.capnp)
 
 add_custom_target(generate_capnp DEPENDS generate_lcp_distributed ${generated_capnp_files})
 
@@ -268,9 +268,9 @@ set(mg_single_node_ha_sources
     query/plan/variable_start_planner.cpp
     query/repl.cpp
     query/typed_value.cpp
-    storage/common/property_value.cpp
-    storage/common/property_value_store.cpp
-    storage/locking/record_lock.cpp
+    storage/common/types/property_value.cpp
+    storage/common/types/property_value_store.cpp
+    storage/common/locking/record_lock.cpp
     storage/single_node_ha/edge_accessor.cpp
     storage/single_node_ha/record_accessor.cpp
     storage/single_node_ha/vertex_accessor.cpp
@@ -313,11 +313,11 @@ target_compile_definitions(mg-single-node-ha PUBLIC MG_SINGLE_NODE_HA)
 string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build_type)
 
 # STATIC library used to store key-value pairs
-add_library(kvstore_lib STATIC storage/kvstore/kvstore.cpp)
+add_library(kvstore_lib STATIC storage/common/kvstore/kvstore.cpp)
 target_link_libraries(kvstore_lib stdc++fs mg-utils rocksdb bzip2 zlib glog gflags)
 
 # STATIC library for dummy key-value storage
-add_library(kvstore_dummy_lib STATIC storage/kvstore/kvstore_dummy.cpp)
+add_library(kvstore_dummy_lib STATIC storage/common/kvstore/kvstore_dummy.cpp)
 target_link_libraries(kvstore_dummy_lib mg-utils)
 
 # Generate a version.hpp file
diff --git a/src/auth/auth.hpp b/src/auth/auth.hpp
index dcd91f138..ef070fe36 100644
--- a/src/auth/auth.hpp
+++ b/src/auth/auth.hpp
@@ -6,7 +6,7 @@
 
 #include "auth/exceptions.hpp"
 #include "auth/models.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 
 namespace auth {
 
diff --git a/src/database/distributed/graph_db.hpp b/src/database/distributed/graph_db.hpp
index 6c3e8b575..aa56d926a 100644
--- a/src/database/distributed/graph_db.hpp
+++ b/src/database/distributed/graph_db.hpp
@@ -9,7 +9,7 @@
 #include "durability/distributed/recovery.hpp"
 #include "durability/distributed/wal.hpp"
 #include "io/network/endpoint.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/concurrent_id_mapper.hpp"
 #include "storage/distributed/storage.hpp"
 #include "storage/distributed/storage_gc.hpp"
diff --git a/src/database/distributed/graph_db_accessor.hpp b/src/database/distributed/graph_db_accessor.hpp
index 89538cffb..fc5e31579 100644
--- a/src/database/distributed/graph_db_accessor.hpp
+++ b/src/database/distributed/graph_db_accessor.hpp
@@ -11,7 +11,7 @@
 #include <cppitertools/imap.hpp>
 
 #include "database/distributed/graph_db.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "storage/distributed/edge_accessor.hpp"
 #include "storage/distributed/vertex_accessor.hpp"
diff --git a/src/database/distributed/serialization.lcp b/src/database/distributed/serialization.lcp
index 652f19946..a47efe5b5 100644
--- a/src/database/distributed/serialization.lcp
+++ b/src/database/distributed/serialization.lcp
@@ -3,7 +3,7 @@
 
 #include "database/distributed/serialization.capnp.h"
 #include "durability/distributed/state_delta.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 cpp<#
 
 ;; Generate serialization of state-delta
diff --git a/src/database/single_node/graph_db.hpp b/src/database/single_node/graph_db.hpp
index cf6d420d7..110ffe2ed 100644
--- a/src/database/single_node/graph_db.hpp
+++ b/src/database/single_node/graph_db.hpp
@@ -10,7 +10,7 @@
 #include "durability/single_node/recovery.hpp"
 #include "durability/single_node/wal.hpp"
 #include "io/network/endpoint.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/concurrent_id_mapper.hpp"
 #include "storage/single_node/storage.hpp"
 #include "storage/single_node/storage_gc.hpp"
diff --git a/src/database/single_node/graph_db_accessor.hpp b/src/database/single_node/graph_db_accessor.hpp
index 3966ce757..982052a53 100644
--- a/src/database/single_node/graph_db_accessor.hpp
+++ b/src/database/single_node/graph_db_accessor.hpp
@@ -11,7 +11,7 @@
 #include <cppitertools/imap.hpp>
 
 #include "database/single_node/graph_db.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/edge_accessor.hpp"
 #include "storage/single_node/vertex_accessor.hpp"
 #include "transactions/transaction.hpp"
diff --git a/src/database/single_node_ha/graph_db.hpp b/src/database/single_node_ha/graph_db.hpp
index 7c9e16d51..5b2a05c0f 100644
--- a/src/database/single_node_ha/graph_db.hpp
+++ b/src/database/single_node_ha/graph_db.hpp
@@ -10,7 +10,7 @@
 #include "durability/single_node_ha/recovery.hpp"
 #include "durability/single_node_ha/wal.hpp"
 #include "io/network/endpoint.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/concurrent_id_mapper.hpp"
 #include "storage/single_node_ha/storage.hpp"
 #include "storage/single_node_ha/storage_gc.hpp"
diff --git a/src/database/single_node_ha/graph_db_accessor.hpp b/src/database/single_node_ha/graph_db_accessor.hpp
index 730462ebe..ac2bfaf3e 100644
--- a/src/database/single_node_ha/graph_db_accessor.hpp
+++ b/src/database/single_node_ha/graph_db_accessor.hpp
@@ -11,7 +11,7 @@
 #include <cppitertools/imap.hpp>
 
 #include "database/single_node_ha/graph_db.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/edge_accessor.hpp"
 #include "storage/single_node_ha/vertex_accessor.hpp"
 #include "transactions/transaction.hpp"
diff --git a/src/distributed/bfs_rpc_messages.lcp b/src/distributed/bfs_rpc_messages.lcp
index 835fc06c3..383cbc56e 100644
--- a/src/distributed/bfs_rpc_messages.lcp
+++ b/src/distributed/bfs_rpc_messages.lcp
@@ -9,7 +9,7 @@
 #include "query/frontend/semantic/symbol_table.hpp"
 #include "query/plan/distributed_ops.hpp"
 #include "query/serialization.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 #include "transactions/type.hpp"
 #include "utils/serialization.hpp"
 cpp<#
@@ -21,7 +21,7 @@ cpp<#
 (lcp:capnp-import 'ast "/query/frontend/ast/ast_serialization.capnp")
 (lcp:capnp-import 'dist-ops "/query/plan/distributed_ops.capnp")
 (lcp:capnp-import 'query "/query/serialization.capnp")
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 (lcp:capnp-import 'symbol "/query/frontend/semantic/symbol.capnp")
 (lcp:capnp-import 'utils "/utils/serialization.capnp")
 
diff --git a/src/distributed/data_rpc_messages.lcp b/src/distributed/data_rpc_messages.lcp
index c0ae7ea42..a334a484e 100644
--- a/src/distributed/data_rpc_messages.lcp
+++ b/src/distributed/data_rpc_messages.lcp
@@ -8,7 +8,7 @@
 #include "distributed/data_rpc_messages.capnp.h"
 #include "storage/distributed/edge.hpp"
 #include "storage/distributed/gid.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 #include "storage/distributed/vertex.hpp"
 #include "transactions/type.hpp"
 cpp<#
@@ -18,7 +18,7 @@ cpp<#
 (lcp:capnp-namespace "distributed")
 
 (lcp:capnp-import 'utils "/utils/serialization.capnp")
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 
 (lcp:define-struct tx-gid-pair ()
   ((tx-id "tx::TransactionId" :capnp-type "UInt64")
diff --git a/src/distributed/index_rpc_messages.lcp b/src/distributed/index_rpc_messages.lcp
index 9ce4aba81..9913f2cc8 100644
--- a/src/distributed/index_rpc_messages.lcp
+++ b/src/distributed/index_rpc_messages.lcp
@@ -6,8 +6,8 @@
 
 #include "communication/rpc/messages.hpp"
 #include "distributed/index_rpc_messages.capnp.h"
-#include "storage/common/types.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 #include "transactions/transaction.hpp"
 cpp<#
 
@@ -15,7 +15,7 @@ cpp<#
 
 (lcp:capnp-namespace "distributed")
 
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 
 (lcp:define-rpc populate-index
     (:request
diff --git a/src/distributed/pull_produce_rpc_messages.lcp b/src/distributed/pull_produce_rpc_messages.lcp
index 056377af2..ccea8554c 100644
--- a/src/distributed/pull_produce_rpc_messages.lcp
+++ b/src/distributed/pull_produce_rpc_messages.lcp
@@ -29,7 +29,7 @@ cpp<#
 
 (lcp:capnp-namespace "distributed")
 
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 (lcp:capnp-import 'query "/query/serialization.capnp")
 (lcp:capnp-import 'sem "/query/frontend/semantic/symbol.capnp")
 (lcp:capnp-import 'utils "/utils/serialization.capnp")
diff --git a/src/distributed/updates_rpc_clients.hpp b/src/distributed/updates_rpc_clients.hpp
index 39e4b954d..7723f1c76 100644
--- a/src/distributed/updates_rpc_clients.hpp
+++ b/src/distributed/updates_rpc_clients.hpp
@@ -7,7 +7,7 @@
 #include "distributed/updates_rpc_messages.hpp"
 #include "durability/distributed/state_delta.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "storage/distributed/gid.hpp"
 #include "transactions/type.hpp"
diff --git a/src/distributed/updates_rpc_messages.lcp b/src/distributed/updates_rpc_messages.lcp
index 5cca8ea0e..fbaa28111 100644
--- a/src/distributed/updates_rpc_messages.lcp
+++ b/src/distributed/updates_rpc_messages.lcp
@@ -9,7 +9,7 @@
 #include "durability/distributed/state_delta.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "storage/distributed/gid.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 #include "transactions/type.hpp"
 #include "utils/serialization.hpp"
 cpp<#
@@ -19,7 +19,7 @@ cpp<#
 (lcp:capnp-namespace "distributed")
 
 (lcp:capnp-import 'db "/database/distributed/serialization.capnp")
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 (lcp:capnp-import 'utils "/utils/serialization.capnp")
 
 (lcp:capnp-type-conversion "tx::TransactionId" "UInt64")
diff --git a/src/distributed/updates_rpc_server.hpp b/src/distributed/updates_rpc_server.hpp
index 009d09754..2d1fb8a8c 100644
--- a/src/distributed/updates_rpc_server.hpp
+++ b/src/distributed/updates_rpc_server.hpp
@@ -14,7 +14,7 @@
 #include "distributed/updates_rpc_messages.hpp"
 #include "durability/distributed/state_delta.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/edge_accessor.hpp"
 #include "storage/distributed/gid.hpp"
 #include "storage/distributed/vertex_accessor.hpp"
diff --git a/src/durability/distributed/snapshot_value.hpp b/src/durability/distributed/snapshot_value.hpp
index 14ec45209..5be4f478b 100644
--- a/src/durability/distributed/snapshot_value.hpp
+++ b/src/durability/distributed/snapshot_value.hpp
@@ -7,7 +7,7 @@
 #include "communication/bolt/v1/value.hpp"
 // TODO: WTF is this doing here?
 #include "query/typed_value.hpp"
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "utils/algorithm.hpp"
 #include "utils/exceptions.hpp"
diff --git a/src/durability/distributed/state_delta.lcp b/src/durability/distributed/state_delta.lcp
index eaac7a2f0..02c72c996 100644
--- a/src/durability/distributed/state_delta.lcp
+++ b/src/durability/distributed/state_delta.lcp
@@ -5,8 +5,8 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "durability/hashed_file_reader.hpp"
 #include "durability/hashed_file_writer.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "storage/distributed/gid.hpp"
 cpp<#
@@ -19,7 +19,7 @@ cpp<#
 
 (lcp:capnp-namespace "database")
 
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 
 (lcp:capnp-type-conversion "tx::TransactionId" "UInt64")
 (lcp:capnp-type-conversion "gid::Gid" "UInt64")
diff --git a/src/durability/distributed/wal.hpp b/src/durability/distributed/wal.hpp
index 6f7d46f99..a5fc54555 100644
--- a/src/durability/distributed/wal.hpp
+++ b/src/durability/distributed/wal.hpp
@@ -10,8 +10,8 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "data_structures/ring_buffer.hpp"
 #include "durability/distributed/state_delta.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/gid.hpp"
 #include "transactions/type.hpp"
 #include "utils/scheduler.hpp"
diff --git a/src/durability/single_node/state_delta.lcp b/src/durability/single_node/state_delta.lcp
index af5357b65..c7b6760a3 100644
--- a/src/durability/single_node/state_delta.lcp
+++ b/src/durability/single_node/state_delta.lcp
@@ -5,9 +5,9 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "durability/hashed_file_reader.hpp"
 #include "durability/hashed_file_writer.hpp"
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/gid.hpp"
 
 class Vertex;
diff --git a/src/durability/single_node/wal.hpp b/src/durability/single_node/wal.hpp
index b7eb6d20d..33e1bbf82 100644
--- a/src/durability/single_node/wal.hpp
+++ b/src/durability/single_node/wal.hpp
@@ -10,8 +10,8 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "data_structures/ring_buffer.hpp"
 #include "durability/single_node/state_delta.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/gid.hpp"
 #include "transactions/type.hpp"
 #include "utils/scheduler.hpp"
diff --git a/src/durability/single_node_ha/state_delta.lcp b/src/durability/single_node_ha/state_delta.lcp
index e1f12ef92..f4f6167a2 100644
--- a/src/durability/single_node_ha/state_delta.lcp
+++ b/src/durability/single_node_ha/state_delta.lcp
@@ -5,9 +5,9 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "durability/hashed_file_reader.hpp"
 #include "durability/hashed_file_writer.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/gid.hpp"
 
 class Vertex;
diff --git a/src/durability/single_node_ha/wal.hpp b/src/durability/single_node_ha/wal.hpp
index 7cb7588dc..d43a1bd91 100644
--- a/src/durability/single_node_ha/wal.hpp
+++ b/src/durability/single_node_ha/wal.hpp
@@ -10,8 +10,8 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "data_structures/ring_buffer.hpp"
 #include "durability/single_node_ha/state_delta.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/gid.hpp"
 #include "transactions/type.hpp"
 #include "utils/scheduler.hpp"
diff --git a/src/glue/communication.hpp b/src/glue/communication.hpp
index 9231bb57a..21e7b425b 100644
--- a/src/glue/communication.hpp
+++ b/src/glue/communication.hpp
@@ -3,7 +3,7 @@
 
 #include "communication/bolt/v1/value.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 
 namespace glue {
 
diff --git a/src/integrations/kafka/streams.hpp b/src/integrations/kafka/streams.hpp
index c2ad864d7..7a4523d18 100644
--- a/src/integrations/kafka/streams.hpp
+++ b/src/integrations/kafka/streams.hpp
@@ -6,7 +6,7 @@
 #include <unordered_map>
 
 #include "integrations/kafka/consumer.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 
 namespace integrations::kafka {
 
diff --git a/src/query/common.hpp b/src/query/common.hpp
index 87956ba80..80c40c964 100644
--- a/src/query/common.hpp
+++ b/src/query/common.hpp
@@ -9,7 +9,7 @@
 #include "query/frontend/ast/ast.hpp"
 #include "query/frontend/semantic/symbol.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 
 namespace query {
 
diff --git a/src/query/frontend/ast/ast.lcp b/src/query/frontend/ast/ast.lcp
index e5d8e2a6b..7c1a66b45 100644
--- a/src/query/frontend/ast/ast.lcp
+++ b/src/query/frontend/ast/ast.lcp
@@ -9,8 +9,8 @@
 #include "query/frontend/semantic/symbol.hpp"
 #include "query/interpret/awesome_memgraph_functions.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 
 // Hash function for the key in pattern atom property maps.
 namespace std {
@@ -36,7 +36,7 @@ cpp<#
 (lcp:namespace query)
 (lcp:capnp-namespace "query")
 
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 (lcp:capnp-import 'symbol "/query/frontend/semantic/symbol.capnp")
 (lcp:capnp-import 'utils "/utils/serialization.capnp")
 
diff --git a/src/query/frontend/ast/ast_serialization.lcp b/src/query/frontend/ast/ast_serialization.lcp
index 414a20fdd..6b80cbc0d 100644
--- a/src/query/frontend/ast/ast_serialization.lcp
+++ b/src/query/frontend/ast/ast_serialization.lcp
@@ -4,7 +4,7 @@
 #include "query/frontend/ast/ast.hpp"
 #include "query/frontend/ast/ast_serialization.capnp.h"
 #include "query/serialization.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 cpp<#
 
 (load "query/frontend/ast/ast.lcp")
diff --git a/src/query/parameters.hpp b/src/query/parameters.hpp
index e335a1046..37a853d38 100644
--- a/src/query/parameters.hpp
+++ b/src/query/parameters.hpp
@@ -6,7 +6,7 @@
 #include <utility>
 #include <vector>
 
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 
 /**
  * Encapsulates user provided parameters (and stripped literals)
diff --git a/src/query/plan/distributed_ops.lcp b/src/query/plan/distributed_ops.lcp
index ef939d0f8..d36e2562d 100644
--- a/src/query/plan/distributed_ops.lcp
+++ b/src/query/plan/distributed_ops.lcp
@@ -7,7 +7,7 @@
 #include "query/plan/distributed_ops.capnp.h"
 #include "query/plan/operator.hpp"
 #include "query/serialization.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 cpp<#
 
 (load "query/plan/operator.lcp")
diff --git a/src/query/plan/operator.lcp b/src/query/plan/operator.lcp
index bc855392b..92d72d07a 100644
--- a/src/query/plan/operator.lcp
+++ b/src/query/plan/operator.lcp
@@ -14,7 +14,7 @@
 #include "query/frontend/ast/ast.hpp"
 #include "query/frontend/semantic/symbol.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/bound.hpp"
 #include "utils/future.hpp"
 #include "utils/hashing/fnv.hpp"
@@ -126,7 +126,7 @@ cpp<#
 (lcp:capnp-namespace "query::plan")
 
 (lcp:capnp-import 'utils "/utils/serialization.capnp")
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 (lcp:capnp-import 'ast "/query/frontend/ast/ast_serialization.capnp")
 (lcp:capnp-import 'semantic "/query/frontend/semantic/symbol.capnp")
 (lcp:capnp-import 'query "/query/serialization.capnp")
diff --git a/src/query/plan/vertex_count_cache.hpp b/src/query/plan/vertex_count_cache.hpp
index 686bb5937..fe4cf31c6 100644
--- a/src/query/plan/vertex_count_cache.hpp
+++ b/src/query/plan/vertex_count_cache.hpp
@@ -3,8 +3,8 @@
 
 #include <experimental/optional>
 
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/bound.hpp"
 #include "utils/hashing/fnv.hpp"
 
diff --git a/src/query/serialization.capnp b/src/query/serialization.capnp
index 63c996c6e..1757bf877 100644
--- a/src/query/serialization.capnp
+++ b/src/query/serialization.capnp
@@ -2,7 +2,7 @@
 
 using Ast = import "/query/frontend/ast/ast_serialization.capnp";
 using Cxx = import "/capnp/c++.capnp";
-using Storage = import "/storage/distributed/serialization.capnp";
+using Storage = import "/storage/distributed/rpc/serialization.capnp";
 using Utils = import "/utils/serialization.capnp";
 
 $Cxx.namespace("query::capnp");
diff --git a/src/query/serialization.hpp b/src/query/serialization.hpp
index 4f7d5d9fe..3297d68f6 100644
--- a/src/query/serialization.hpp
+++ b/src/query/serialization.hpp
@@ -7,7 +7,7 @@
 #include "query/frontend/semantic/symbol_table.hpp"
 #include "query/serialization.capnp.h"
 #include "query/typed_value.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 
 namespace distributed {
 class DataManager;
diff --git a/src/query/typed_value.hpp b/src/query/typed_value.hpp
index 5f1f44b84..db68628cd 100644
--- a/src/query/typed_value.hpp
+++ b/src/query/typed_value.hpp
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "query/path.hpp"
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 #include "storage/edge_accessor.hpp"
 #include "storage/vertex_accessor.hpp"
 #include "utils/exceptions.hpp"
diff --git a/src/storage/kvstore/kvstore.cpp b/src/storage/common/kvstore/kvstore.cpp
similarity index 99%
rename from src/storage/kvstore/kvstore.cpp
rename to src/storage/common/kvstore/kvstore.cpp
index 2b464fc3a..e29ffa334 100644
--- a/src/storage/kvstore/kvstore.cpp
+++ b/src/storage/common/kvstore/kvstore.cpp
@@ -1,7 +1,7 @@
 #include <rocksdb/db.h>
 #include <rocksdb/options.h>
 
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "utils/file.hpp"
 
 namespace storage {
diff --git a/src/storage/kvstore/kvstore.hpp b/src/storage/common/kvstore/kvstore.hpp
similarity index 100%
rename from src/storage/kvstore/kvstore.hpp
rename to src/storage/common/kvstore/kvstore.hpp
diff --git a/src/storage/kvstore/kvstore_dummy.cpp b/src/storage/common/kvstore/kvstore_dummy.cpp
similarity index 98%
rename from src/storage/kvstore/kvstore_dummy.cpp
rename to src/storage/common/kvstore/kvstore_dummy.cpp
index 8f001f647..ec215c2f6 100644
--- a/src/storage/kvstore/kvstore_dummy.cpp
+++ b/src/storage/common/kvstore/kvstore_dummy.cpp
@@ -1,4 +1,4 @@
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 
 #include <glog/logging.h>
 
diff --git a/src/storage/locking/lock_status.hpp b/src/storage/common/locking/lock_status.hpp
similarity index 100%
rename from src/storage/locking/lock_status.hpp
rename to src/storage/common/locking/lock_status.hpp
diff --git a/src/storage/locking/record_lock.cpp b/src/storage/common/locking/record_lock.cpp
similarity index 98%
rename from src/storage/locking/record_lock.cpp
rename to src/storage/common/locking/record_lock.cpp
index 0eb8531ff..c6a81c169 100644
--- a/src/storage/locking/record_lock.cpp
+++ b/src/storage/common/locking/record_lock.cpp
@@ -1,4 +1,4 @@
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/record_lock.hpp"
 
 #include <fmt/format.h>
 #include <glog/logging.h>
diff --git a/src/storage/locking/record_lock.hpp b/src/storage/common/locking/record_lock.hpp
similarity index 91%
rename from src/storage/locking/record_lock.hpp
rename to src/storage/common/locking/record_lock.hpp
index 231554f73..78aaf7801 100644
--- a/src/storage/locking/record_lock.hpp
+++ b/src/storage/common/locking/record_lock.hpp
@@ -4,7 +4,7 @@
 #include <chrono>
 #include <unordered_set>
 
-#include "storage/locking/lock_status.hpp"
+#include "storage/common/locking/lock_status.hpp"
 #include "transactions/type.hpp"
 
 namespace tx {
diff --git a/src/mvcc/common/version.hpp b/src/storage/common/mvcc/version.hpp
similarity index 100%
rename from src/mvcc/common/version.hpp
rename to src/storage/common/mvcc/version.hpp
diff --git a/src/storage/common/property_value.cpp b/src/storage/common/types/property_value.cpp
similarity index 99%
rename from src/storage/common/property_value.cpp
rename to src/storage/common/types/property_value.cpp
index a6c11d0aa..c1b90f419 100644
--- a/src/storage/common/property_value.cpp
+++ b/src/storage/common/types/property_value.cpp
@@ -1,4 +1,4 @@
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 
 // const value extraction template instantiations
 template <>
diff --git a/src/storage/common/property_value.hpp b/src/storage/common/types/property_value.hpp
similarity index 100%
rename from src/storage/common/property_value.hpp
rename to src/storage/common/types/property_value.hpp
diff --git a/src/storage/common/property_value_store.cpp b/src/storage/common/types/property_value_store.cpp
similarity index 99%
rename from src/storage/common/property_value_store.cpp
rename to src/storage/common/types/property_value_store.cpp
index 36a308fb3..dc7fe33d9 100644
--- a/src/storage/common/property_value_store.cpp
+++ b/src/storage/common/types/property_value_store.cpp
@@ -1,4 +1,4 @@
-#include "storage/common/property_value_store.hpp"
+#include "storage/common/types/property_value_store.hpp"
 
 #include <experimental/filesystem>
 
diff --git a/src/storage/common/property_value_store.hpp b/src/storage/common/types/property_value_store.hpp
similarity index 97%
rename from src/storage/common/property_value_store.hpp
rename to src/storage/common/types/property_value_store.hpp
index 129d89907..faef6a213 100644
--- a/src/storage/common/property_value_store.hpp
+++ b/src/storage/common/types/property_value_store.hpp
@@ -5,9 +5,9 @@
 #include <string>
 #include <vector>
 
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 
 /**
  * A collection of properties accessed in a map-like way using a key of type
diff --git a/src/storage/common/types.hpp b/src/storage/common/types/types.hpp
similarity index 100%
rename from src/storage/common/types.hpp
rename to src/storage/common/types/types.hpp
diff --git a/src/storage/distributed/address_types.hpp b/src/storage/distributed/address_types.hpp
index 490e098a0..fa4115f44 100644
--- a/src/storage/distributed/address_types.hpp
+++ b/src/storage/distributed/address_types.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "mvcc/distributed/version_list.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
 #include "storage/distributed/address.hpp"
 
 class Edge;
diff --git a/src/storage/distributed/concurrent_id_mapper_master.cpp b/src/storage/distributed/concurrent_id_mapper_master.cpp
index 84fad7561..791a74f4f 100644
--- a/src/storage/distributed/concurrent_id_mapper_master.cpp
+++ b/src/storage/distributed/concurrent_id_mapper_master.cpp
@@ -2,8 +2,8 @@
 
 #include <glog/logging.h>
 
-#include "storage/common/types.hpp"
-#include "storage/distributed/concurrent_id_mapper_rpc_messages.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/distributed/rpc/concurrent_id_mapper_rpc_messages.hpp"
 
 namespace storage {
 
diff --git a/src/storage/distributed/concurrent_id_mapper_single_node.hpp b/src/storage/distributed/concurrent_id_mapper_single_node.hpp
index 834e66532..81647c722 100644
--- a/src/storage/distributed/concurrent_id_mapper_single_node.hpp
+++ b/src/storage/distributed/concurrent_id_mapper_single_node.hpp
@@ -3,7 +3,7 @@
 #include <mutex>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/concurrent_id_mapper.hpp"
 #include "utils/algorithm.hpp"
 
diff --git a/src/storage/distributed/concurrent_id_mapper_worker.cpp b/src/storage/distributed/concurrent_id_mapper_worker.cpp
index 382847b43..c19ff0047 100644
--- a/src/storage/distributed/concurrent_id_mapper_worker.cpp
+++ b/src/storage/distributed/concurrent_id_mapper_worker.cpp
@@ -2,8 +2,8 @@
 
 #include <glog/logging.h>
 
-#include "storage/common/types.hpp"
-#include "storage/distributed/concurrent_id_mapper_rpc_messages.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/distributed/rpc/concurrent_id_mapper_rpc_messages.hpp"
 
 namespace storage {
 
diff --git a/src/storage/distributed/deferred_deleter.hpp b/src/storage/distributed/deferred_deleter.hpp
index 2d349af96..bb9db10e5 100644
--- a/src/storage/distributed/deferred_deleter.hpp
+++ b/src/storage/distributed/deferred_deleter.hpp
@@ -6,7 +6,7 @@
 #include <list>
 
 #include "glog/logging.h"
-#include "mvcc/distributed/record.hpp"
+#include "storage/distributed/mvcc/record.hpp"
 #include "transactions/transaction.hpp"
 
 /**
diff --git a/src/storage/distributed/edge.hpp b/src/storage/distributed/edge.hpp
index 9eead4b42..61e5fab6a 100644
--- a/src/storage/distributed/edge.hpp
+++ b/src/storage/distributed/edge.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/distributed/record.hpp"
-#include "mvcc/distributed/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/distributed/mvcc/record.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address.hpp"
 
 class Vertex;
diff --git a/src/storage/distributed/edges.hpp b/src/storage/distributed/edges.hpp
index f53db09b2..f278a9eee 100644
--- a/src/storage/distributed/edges.hpp
+++ b/src/storage/distributed/edges.hpp
@@ -6,8 +6,8 @@
 
 #include "glog/logging.h"
 
-#include "mvcc/distributed/version_list.hpp"
-#include "storage/common/types.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "utils/algorithm.hpp"
diff --git a/src/storage/distributed/garbage_collector.hpp b/src/storage/distributed/garbage_collector.hpp
index 40b40bc63..13f1892b0 100644
--- a/src/storage/distributed/garbage_collector.hpp
+++ b/src/storage/distributed/garbage_collector.hpp
@@ -3,7 +3,7 @@
 #include <glog/logging.h>
 
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/distributed/version_list.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
 #include "storage/distributed/deferred_deleter.hpp"
 #include "transactions/distributed/engine.hpp"
 
diff --git a/src/storage/distributed/indexes/key_index.hpp b/src/storage/distributed/indexes/key_index.hpp
index 82473a31d..52caba239 100644
--- a/src/storage/distributed/indexes/key_index.hpp
+++ b/src/storage/distributed/indexes/key_index.hpp
@@ -3,9 +3,9 @@
 #include "glog/logging.h"
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/distributed/version_list.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/edge.hpp"
 #include "storage/distributed/vertex.hpp"
 #include "transactions/transaction.hpp"
diff --git a/src/storage/distributed/indexes/label_property_index.hpp b/src/storage/distributed/indexes/label_property_index.hpp
index e2a1e077a..e7923a5e5 100644
--- a/src/storage/distributed/indexes/label_property_index.hpp
+++ b/src/storage/distributed/indexes/label_property_index.hpp
@@ -4,9 +4,9 @@
 
 #include "data_structures/concurrent/concurrent_map.hpp"
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/distributed/version_list.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/edge.hpp"
 #include "storage/distributed/vertex.hpp"
 #include "transactions/transaction.hpp"
diff --git a/src/mvcc/distributed/record.hpp b/src/storage/distributed/mvcc/record.hpp
similarity index 99%
rename from src/mvcc/distributed/record.hpp
rename to src/storage/distributed/mvcc/record.hpp
index 6de7c93ad..8c3735447 100644
--- a/src/mvcc/distributed/record.hpp
+++ b/src/storage/distributed/mvcc/record.hpp
@@ -8,8 +8,8 @@
 #include "transactions/distributed/engine.hpp"
 #include "transactions/transaction.hpp"
 
-#include "mvcc/common/version.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/mvcc/version.hpp"
+#include "storage/common/locking/record_lock.hpp"
 
 // the mvcc implementation used here is very much like postgresql's
 // more info: https://momjian.us/main/writings/pgsql/mvcc.pdf
diff --git a/src/mvcc/distributed/version_list.hpp b/src/storage/distributed/mvcc/version_list.hpp
similarity index 99%
rename from src/mvcc/distributed/version_list.hpp
rename to src/storage/distributed/mvcc/version_list.hpp
index 745405c2f..e42d2d3a8 100644
--- a/src/mvcc/distributed/version_list.hpp
+++ b/src/storage/distributed/mvcc/version_list.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "storage/distributed/gid.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/record_lock.hpp"
 #include "transactions/transaction.hpp"
 #include "utils/exceptions.hpp"
 
diff --git a/src/storage/distributed/record_accessor.hpp b/src/storage/distributed/record_accessor.hpp
index c2398cfb8..47a0cff75 100644
--- a/src/storage/distributed/record_accessor.hpp
+++ b/src/storage/distributed/record_accessor.hpp
@@ -3,10 +3,10 @@
 
 #include <glog/logging.h>
 
-#include "mvcc/distributed/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address.hpp"
 #include "storage/distributed/gid.hpp"
 #include "utils/total_ordering.hpp"
diff --git a/src/storage/distributed/concurrent_id_mapper_rpc_messages.lcp b/src/storage/distributed/rpc/concurrent_id_mapper_rpc_messages.lcp
similarity index 81%
rename from src/storage/distributed/concurrent_id_mapper_rpc_messages.lcp
rename to src/storage/distributed/rpc/concurrent_id_mapper_rpc_messages.lcp
index 71649b0ed..63e2cf80d 100644
--- a/src/storage/distributed/concurrent_id_mapper_rpc_messages.lcp
+++ b/src/storage/distributed/rpc/concurrent_id_mapper_rpc_messages.lcp
@@ -4,9 +4,9 @@
 #include <chrono>
 
 #include "communication/rpc/messages.hpp"
-#include "storage/common/types.hpp"
-#include "storage/distributed/concurrent_id_mapper_rpc_messages.capnp.h"
-#include "storage/distributed/serialization.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/distributed/rpc/concurrent_id_mapper_rpc_messages.capnp.h"
+#include "storage/distributed/rpc/serialization.hpp"
 #include "transactions/commit_log.hpp"
 #include "transactions/snapshot.hpp"
 #include "transactions/type.hpp"
@@ -16,7 +16,7 @@ cpp<#
 
 (lcp:capnp-namespace "storage")
 
-(lcp:capnp-import 's "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 's "/storage/distributed/rpc/serialization.capnp")
 
 (lcp:define-rpc label-id
     (:request ((member "std::string")))
diff --git a/src/storage/distributed/serialization.capnp b/src/storage/distributed/rpc/serialization.capnp
similarity index 100%
rename from src/storage/distributed/serialization.capnp
rename to src/storage/distributed/rpc/serialization.capnp
diff --git a/src/storage/distributed/serialization.cpp b/src/storage/distributed/rpc/serialization.cpp
similarity index 99%
rename from src/storage/distributed/serialization.cpp
rename to src/storage/distributed/rpc/serialization.cpp
index 9b2f38332..2fd9dc496 100644
--- a/src/storage/distributed/serialization.cpp
+++ b/src/storage/distributed/rpc/serialization.cpp
@@ -1,4 +1,4 @@
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 
 #include "database/distributed/graph_db_accessor.hpp"
 #include "distributed/data_manager.hpp"
diff --git a/src/storage/distributed/serialization.hpp b/src/storage/distributed/rpc/serialization.hpp
similarity index 94%
rename from src/storage/distributed/serialization.hpp
rename to src/storage/distributed/rpc/serialization.hpp
index 73bd8d134..efaa63d06 100644
--- a/src/storage/distributed/serialization.hpp
+++ b/src/storage/distributed/rpc/serialization.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "storage/common/property_value.hpp"
-#include "storage/common/property_value_store.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/property_value_store.hpp"
 #include "storage/distributed/edge.hpp"
 #include "storage/distributed/edge_accessor.hpp"
-#include "storage/distributed/serialization.capnp.h"
+#include "storage/distributed/rpc/serialization.capnp.h"
 #include "storage/distributed/vertex.hpp"
 #include "storage/distributed/vertex_accessor.hpp"
 
diff --git a/src/storage/distributed/storage.hpp b/src/storage/distributed/storage.hpp
index 4ab422a0e..dcf719504 100644
--- a/src/storage/distributed/storage.hpp
+++ b/src/storage/distributed/storage.hpp
@@ -5,14 +5,14 @@
 
 #include "data_structures/concurrent/concurrent_map.hpp"
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/distributed/version_list.hpp"
-#include "storage/common/types.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address.hpp"
 #include "storage/distributed/edge.hpp"
 #include "storage/distributed/indexes/key_index.hpp"
 #include "storage/distributed/indexes/label_property_index.hpp"
 #include "storage/distributed/vertex.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "transactions/type.hpp"
 
 namespace distributed {
diff --git a/src/storage/distributed/storage_gc.hpp b/src/storage/distributed/storage_gc.hpp
index 700abe090..629639b54 100644
--- a/src/storage/distributed/storage_gc.hpp
+++ b/src/storage/distributed/storage_gc.hpp
@@ -4,7 +4,7 @@
 #include <queue>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/distributed/version_list.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
 #include "stats/metrics.hpp"
 #include "storage/distributed/deferred_deleter.hpp"
 #include "storage/distributed/edge.hpp"
diff --git a/src/storage/distributed/vertex.hpp b/src/storage/distributed/vertex.hpp
index c5b879a7f..653631eca 100644
--- a/src/storage/distributed/vertex.hpp
+++ b/src/storage/distributed/vertex.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/distributed/record.hpp"
-#include "mvcc/distributed/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/distributed/mvcc/record.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address.hpp"
 #include "storage/distributed/edges.hpp"
 
diff --git a/src/storage/single_node/concurrent_id_mapper.hpp b/src/storage/single_node/concurrent_id_mapper.hpp
index 745bca682..272a2353a 100644
--- a/src/storage/single_node/concurrent_id_mapper.hpp
+++ b/src/storage/single_node/concurrent_id_mapper.hpp
@@ -3,7 +3,7 @@
 #include <mutex>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/algorithm.hpp"
 
 namespace storage {
diff --git a/src/storage/single_node/deferred_deleter.hpp b/src/storage/single_node/deferred_deleter.hpp
index 578f692ce..a22263bd8 100644
--- a/src/storage/single_node/deferred_deleter.hpp
+++ b/src/storage/single_node/deferred_deleter.hpp
@@ -6,7 +6,7 @@
 #include <list>
 
 #include "glog/logging.h"
-#include "mvcc/single_node/record.hpp"
+#include "storage/single_node/mvcc/record.hpp"
 #include "transactions/transaction.hpp"
 
 /**
diff --git a/src/storage/single_node/edge.hpp b/src/storage/single_node/edge.hpp
index 3237a6765..5cc7ad06e 100644
--- a/src/storage/single_node/edge.hpp
+++ b/src/storage/single_node/edge.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/single_node/record.hpp"
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/record.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 
 class Vertex;
 
diff --git a/src/storage/single_node/edges.hpp b/src/storage/single_node/edges.hpp
index 245af0c8a..f2e69efaf 100644
--- a/src/storage/single_node/edges.hpp
+++ b/src/storage/single_node/edges.hpp
@@ -6,8 +6,8 @@
 
 #include "glog/logging.h"
 
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/algorithm.hpp"
 
 /**
diff --git a/src/storage/single_node/garbage_collector.hpp b/src/storage/single_node/garbage_collector.hpp
index 585e90425..ac5ef63c5 100644
--- a/src/storage/single_node/garbage_collector.hpp
+++ b/src/storage/single_node/garbage_collector.hpp
@@ -3,7 +3,7 @@
 #include <glog/logging.h>
 
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "storage/single_node/deferred_deleter.hpp"
 #include "transactions/single_node/engine.hpp"
 
diff --git a/src/storage/single_node/indexes/key_index.hpp b/src/storage/single_node/indexes/key_index.hpp
index d999c52d0..e632ef461 100644
--- a/src/storage/single_node/indexes/key_index.hpp
+++ b/src/storage/single_node/indexes/key_index.hpp
@@ -3,9 +3,9 @@
 #include "glog/logging.h"
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/edge.hpp"
 #include "storage/single_node/vertex.hpp"
 #include "transactions/transaction.hpp"
diff --git a/src/storage/single_node/indexes/label_property_index.hpp b/src/storage/single_node/indexes/label_property_index.hpp
index fded09f6b..403a5bda1 100644
--- a/src/storage/single_node/indexes/label_property_index.hpp
+++ b/src/storage/single_node/indexes/label_property_index.hpp
@@ -4,9 +4,9 @@
 
 #include "data_structures/concurrent/concurrent_map.hpp"
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/edge.hpp"
 #include "storage/single_node/vertex.hpp"
 #include "transactions/transaction.hpp"
diff --git a/src/mvcc/single_node/record.hpp b/src/storage/single_node/mvcc/record.hpp
similarity index 99%
rename from src/mvcc/single_node/record.hpp
rename to src/storage/single_node/mvcc/record.hpp
index 022c1a6e8..b04757703 100644
--- a/src/mvcc/single_node/record.hpp
+++ b/src/storage/single_node/mvcc/record.hpp
@@ -8,8 +8,8 @@
 #include "transactions/single_node/engine.hpp"
 #include "transactions/transaction.hpp"
 
-#include "mvcc/common/version.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/mvcc/version.hpp"
+#include "storage/common/locking/record_lock.hpp"
 
 // the mvcc implementation used here is very much like postgresql's
 // more info: https://momjian.us/main/writings/pgsql/mvcc.pdf
diff --git a/src/mvcc/single_node/version_list.hpp b/src/storage/single_node/mvcc/version_list.hpp
similarity index 99%
rename from src/mvcc/single_node/version_list.hpp
rename to src/storage/single_node/mvcc/version_list.hpp
index 1ac3bfed1..1a57dc7e3 100644
--- a/src/mvcc/single_node/version_list.hpp
+++ b/src/storage/single_node/mvcc/version_list.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "storage/single_node/gid.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/record_lock.hpp"
 #include "transactions/transaction.hpp"
 #include "utils/cast.hpp"
 #include "utils/exceptions.hpp"
diff --git a/src/storage/single_node/record_accessor.hpp b/src/storage/single_node/record_accessor.hpp
index b36653548..7cf3dfb02 100644
--- a/src/storage/single_node/record_accessor.hpp
+++ b/src/storage/single_node/record_accessor.hpp
@@ -3,10 +3,10 @@
 
 #include <glog/logging.h>
 
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/gid.hpp"
 #include "utils/total_ordering.hpp"
 
diff --git a/src/storage/single_node/storage.hpp b/src/storage/single_node/storage.hpp
index 784b3a742..46d995105 100644
--- a/src/storage/single_node/storage.hpp
+++ b/src/storage/single_node/storage.hpp
@@ -4,9 +4,9 @@
 #include <experimental/optional>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/types.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "storage/single_node/edge.hpp"
 #include "storage/single_node/indexes/key_index.hpp"
 #include "storage/single_node/indexes/label_property_index.hpp"
diff --git a/src/storage/single_node/storage_gc.hpp b/src/storage/single_node/storage_gc.hpp
index e9fb7317e..45aad8b68 100644
--- a/src/storage/single_node/storage_gc.hpp
+++ b/src/storage/single_node/storage_gc.hpp
@@ -4,7 +4,7 @@
 #include <queue>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "stats/metrics.hpp"
 #include "storage/single_node/deferred_deleter.hpp"
 #include "storage/single_node/edge.hpp"
diff --git a/src/storage/single_node/vertex.hpp b/src/storage/single_node/vertex.hpp
index 71d989b73..5878d12fe 100644
--- a/src/storage/single_node/vertex.hpp
+++ b/src/storage/single_node/vertex.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/single_node/record.hpp"
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/record.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/edges.hpp"
 
 class Vertex : public mvcc::Record<Vertex> {
diff --git a/src/storage/single_node_ha/concurrent_id_mapper.hpp b/src/storage/single_node_ha/concurrent_id_mapper.hpp
index 745bca682..272a2353a 100644
--- a/src/storage/single_node_ha/concurrent_id_mapper.hpp
+++ b/src/storage/single_node_ha/concurrent_id_mapper.hpp
@@ -3,7 +3,7 @@
 #include <mutex>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/algorithm.hpp"
 
 namespace storage {
diff --git a/src/storage/single_node_ha/deferred_deleter.hpp b/src/storage/single_node_ha/deferred_deleter.hpp
index 248dbb3c1..0b11ac7ec 100644
--- a/src/storage/single_node_ha/deferred_deleter.hpp
+++ b/src/storage/single_node_ha/deferred_deleter.hpp
@@ -6,7 +6,7 @@
 #include <list>
 
 #include "glog/logging.h"
-#include "mvcc/single_node_ha/record.hpp"
+#include "storage/single_node_ha/mvcc/record.hpp"
 #include "transactions/transaction.hpp"
 
 /**
diff --git a/src/storage/single_node_ha/edge.hpp b/src/storage/single_node_ha/edge.hpp
index de5c569a5..150d39b08 100644
--- a/src/storage/single_node_ha/edge.hpp
+++ b/src/storage/single_node_ha/edge.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/single_node_ha/record.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node_ha/mvcc/record.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 
 class Vertex;
 
diff --git a/src/storage/single_node_ha/edges.hpp b/src/storage/single_node_ha/edges.hpp
index 68bab8cb0..4a05c7050 100644
--- a/src/storage/single_node_ha/edges.hpp
+++ b/src/storage/single_node_ha/edges.hpp
@@ -6,8 +6,8 @@
 
 #include "glog/logging.h"
 
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/algorithm.hpp"
 
 /**
diff --git a/src/storage/single_node_ha/garbage_collector.hpp b/src/storage/single_node_ha/garbage_collector.hpp
index 716f96fb7..59ba5f129 100644
--- a/src/storage/single_node_ha/garbage_collector.hpp
+++ b/src/storage/single_node_ha/garbage_collector.hpp
@@ -3,7 +3,7 @@
 #include <glog/logging.h>
 
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
 #include "storage/single_node_ha/deferred_deleter.hpp"
 #include "transactions/single_node_ha/engine.hpp"
 
diff --git a/src/storage/single_node_ha/indexes/key_index.hpp b/src/storage/single_node_ha/indexes/key_index.hpp
index 30a93905a..80743031e 100644
--- a/src/storage/single_node_ha/indexes/key_index.hpp
+++ b/src/storage/single_node_ha/indexes/key_index.hpp
@@ -3,9 +3,9 @@
 #include "glog/logging.h"
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/edge.hpp"
 #include "storage/single_node_ha/vertex.hpp"
 #include "transactions/transaction.hpp"
diff --git a/src/storage/single_node_ha/indexes/label_property_index.hpp b/src/storage/single_node_ha/indexes/label_property_index.hpp
index 909dbf163..9ca05c464 100644
--- a/src/storage/single_node_ha/indexes/label_property_index.hpp
+++ b/src/storage/single_node_ha/indexes/label_property_index.hpp
@@ -4,9 +4,9 @@
 
 #include "data_structures/concurrent/concurrent_map.hpp"
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/edge.hpp"
 #include "storage/single_node_ha/vertex.hpp"
 #include "transactions/transaction.hpp"
diff --git a/src/mvcc/single_node_ha/record.hpp b/src/storage/single_node_ha/mvcc/record.hpp
similarity index 99%
rename from src/mvcc/single_node_ha/record.hpp
rename to src/storage/single_node_ha/mvcc/record.hpp
index eac1e66e7..e925da283 100644
--- a/src/mvcc/single_node_ha/record.hpp
+++ b/src/storage/single_node_ha/mvcc/record.hpp
@@ -8,8 +8,8 @@
 #include "transactions/single_node_ha/engine.hpp"
 #include "transactions/transaction.hpp"
 
-#include "mvcc/common/version.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/mvcc/version.hpp"
+#include "storage/common/locking/record_lock.hpp"
 
 // the mvcc implementation used here is very much like postgresql's
 // more info: https://momjian.us/main/writings/pgsql/mvcc.pdf
diff --git a/src/mvcc/single_node_ha/version_list.hpp b/src/storage/single_node_ha/mvcc/version_list.hpp
similarity index 99%
rename from src/mvcc/single_node_ha/version_list.hpp
rename to src/storage/single_node_ha/mvcc/version_list.hpp
index 859393da2..533c72069 100644
--- a/src/mvcc/single_node_ha/version_list.hpp
+++ b/src/storage/single_node_ha/mvcc/version_list.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "storage/single_node_ha/gid.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/record_lock.hpp"
 #include "transactions/transaction.hpp"
 #include "utils/cast.hpp"
 #include "utils/exceptions.hpp"
diff --git a/src/storage/single_node_ha/record_accessor.hpp b/src/storage/single_node_ha/record_accessor.hpp
index 739ea1d74..eacbc45ad 100644
--- a/src/storage/single_node_ha/record_accessor.hpp
+++ b/src/storage/single_node_ha/record_accessor.hpp
@@ -3,10 +3,10 @@
 
 #include <glog/logging.h>
 
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/gid.hpp"
 #include "utils/total_ordering.hpp"
 
diff --git a/src/storage/single_node_ha/storage.hpp b/src/storage/single_node_ha/storage.hpp
index 5f71490ec..6eb9e2f5d 100644
--- a/src/storage/single_node_ha/storage.hpp
+++ b/src/storage/single_node_ha/storage.hpp
@@ -4,9 +4,9 @@
 #include <experimental/optional>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/types.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "storage/single_node_ha/edge.hpp"
 #include "storage/single_node_ha/indexes/key_index.hpp"
 #include "storage/single_node_ha/indexes/label_property_index.hpp"
diff --git a/src/storage/single_node_ha/storage_gc.hpp b/src/storage/single_node_ha/storage_gc.hpp
index 3837e3e4b..64b1a5bc7 100644
--- a/src/storage/single_node_ha/storage_gc.hpp
+++ b/src/storage/single_node_ha/storage_gc.hpp
@@ -4,7 +4,7 @@
 #include <queue>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
 #include "stats/metrics.hpp"
 #include "storage/single_node_ha/deferred_deleter.hpp"
 #include "storage/single_node_ha/edge.hpp"
diff --git a/src/storage/single_node_ha/vertex.hpp b/src/storage/single_node_ha/vertex.hpp
index 0899045cb..9e1c653cd 100644
--- a/src/storage/single_node_ha/vertex.hpp
+++ b/src/storage/single_node_ha/vertex.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/single_node_ha/record.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node_ha/mvcc/record.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/edges.hpp"
 
 class Vertex : public mvcc::Record<Vertex> {
diff --git a/src/telemetry/telemetry.hpp b/src/telemetry/telemetry.hpp
index ce32e8e80..b4aecc0ba 100644
--- a/src/telemetry/telemetry.hpp
+++ b/src/telemetry/telemetry.hpp
@@ -5,7 +5,7 @@
 
 #include <json/json.hpp>
 
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "utils/scheduler.hpp"
 #include "utils/timer.hpp"
 
diff --git a/src/transactions/lock_store.hpp b/src/transactions/lock_store.hpp
index 1cea9d451..4185571b4 100644
--- a/src/transactions/lock_store.hpp
+++ b/src/transactions/lock_store.hpp
@@ -5,8 +5,8 @@
 #include <vector>
 
 #include "glog/logging.h"
-#include "storage/locking/lock_status.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/lock_status.hpp"
+#include "storage/common/locking/record_lock.hpp"
 #include "transactions/type.hpp"
 #include "utils/thread/sync.hpp"
 
diff --git a/src/transactions/transaction.hpp b/src/transactions/transaction.hpp
index dcad92444..43e6c2486 100644
--- a/src/transactions/transaction.hpp
+++ b/src/transactions/transaction.hpp
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/record_lock.hpp"
 #include "transactions/lock_store.hpp"
 #include "transactions/snapshot.hpp"
 #include "transactions/type.hpp"
diff --git a/src/utils/random_graph_generator.hpp b/src/utils/random_graph_generator.hpp
index 37bf21d1f..402924843 100644
--- a/src/utils/random_graph_generator.hpp
+++ b/src/utils/random_graph_generator.hpp
@@ -9,9 +9,9 @@
 
 #include "data_structures/concurrent/skiplist.hpp"
 #include "database/single_node/graph_db_accessor.hpp"
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/vertex_accessor.hpp"
 
 // TODO: Why is this file here? It is used only in a test...
diff --git a/tests/benchmark/mvcc.cpp b/tests/benchmark/mvcc.cpp
index 24f3c3881..ae13fe3ca 100644
--- a/tests/benchmark/mvcc.cpp
+++ b/tests/benchmark/mvcc.cpp
@@ -2,8 +2,8 @@
 #include <benchmark/benchmark_api.h>
 #include <glog/logging.h>
 
-#include "mvcc/single_node/record.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/single_node/mvcc/record.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "transactions/single_node/engine.hpp"
 
 class Prop : public mvcc::Record<Prop> {
diff --git a/tests/manual/kvstore_console.cpp b/tests/manual/kvstore_console.cpp
index dfbe08bcc..17ae5bd6a 100644
--- a/tests/manual/kvstore_console.cpp
+++ b/tests/manual/kvstore_console.cpp
@@ -1,7 +1,7 @@
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "utils/string.hpp"
 
 DEFINE_string(path, "", "Path to the storage directory.");
diff --git a/tests/manual/snapshot_generation/graph_state.hpp b/tests/manual/snapshot_generation/graph_state.hpp
index 3b177f0be..1192d6734 100644
--- a/tests/manual/snapshot_generation/graph_state.hpp
+++ b/tests/manual/snapshot_generation/graph_state.hpp
@@ -7,7 +7,7 @@
 #include "cppitertools/itertools.hpp"
 #include "json/json.hpp"
 
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 #include "storage/distributed/gid.hpp"
 #include "utils/string.hpp"
 
diff --git a/tests/manual/snapshot_generation/value_generator.hpp b/tests/manual/snapshot_generation/value_generator.hpp
index d3013aa24..717db852f 100644
--- a/tests/manual/snapshot_generation/value_generator.hpp
+++ b/tests/manual/snapshot_generation/value_generator.hpp
@@ -7,7 +7,7 @@
 #include <glog/logging.h>
 #include <json/json.hpp>
 
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 
 namespace snapshot_generation {
 
diff --git a/tests/unit/concurrent_id_mapper_distributed.cpp b/tests/unit/concurrent_id_mapper_distributed.cpp
index 22e289820..080d79dc3 100644
--- a/tests/unit/concurrent_id_mapper_distributed.cpp
+++ b/tests/unit/concurrent_id_mapper_distributed.cpp
@@ -3,7 +3,7 @@
 #include <gtest/gtest.h>
 
 #include "communication/rpc/server.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/concurrent_id_mapper_master.hpp"
 #include "storage/distributed/concurrent_id_mapper_worker.hpp"
 
diff --git a/tests/unit/concurrent_id_mapper_single_node.cpp b/tests/unit/concurrent_id_mapper_single_node.cpp
index 87090b04d..63c196614 100644
--- a/tests/unit/concurrent_id_mapper_single_node.cpp
+++ b/tests/unit/concurrent_id_mapper_single_node.cpp
@@ -5,7 +5,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/concurrent_id_mapper.hpp"
 
 using IdLabel = storage::Label;
diff --git a/tests/unit/database_key_index.cpp b/tests/unit/database_key_index.cpp
index 5a23ba777..267068f44 100644
--- a/tests/unit/database_key_index.cpp
+++ b/tests/unit/database_key_index.cpp
@@ -3,7 +3,7 @@
 
 #include "database/single_node/graph_db.hpp"
 #include "database/single_node/graph_db_accessor.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/vertex.hpp"
 #include "transactions/single_node/engine.hpp"
 
diff --git a/tests/unit/database_label_property_index.cpp b/tests/unit/database_label_property_index.cpp
index 6a8c6345a..346796e37 100644
--- a/tests/unit/database_label_property_index.cpp
+++ b/tests/unit/database_label_property_index.cpp
@@ -2,7 +2,7 @@
 
 #include "database/single_node/graph_db.hpp"
 #include "database/single_node/graph_db_accessor.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/indexes/label_property_index.hpp"
 #include "transactions/single_node/engine.hpp"
 
diff --git a/tests/unit/deferred_deleter.cpp b/tests/unit/deferred_deleter.cpp
index 5491e5bc7..00b86041e 100644
--- a/tests/unit/deferred_deleter.cpp
+++ b/tests/unit/deferred_deleter.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "mvcc/single_node/record.hpp"
+#include "storage/single_node/mvcc/record.hpp"
 #include "storage/single_node/deferred_deleter.hpp"
 #include "storage/single_node/vertex.hpp"
 
diff --git a/tests/unit/distributed_serialization.cpp b/tests/unit/distributed_serialization.cpp
index 39ef6dc1e..5d4b4b5d2 100644
--- a/tests/unit/distributed_serialization.cpp
+++ b/tests/unit/distributed_serialization.cpp
@@ -3,12 +3,12 @@
 
 #include <capnp/message.h>
 
-#include "mvcc/distributed/version_list.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/edge.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 #include "storage/distributed/vertex.hpp"
 #include "transactions/distributed/engine_single_node.hpp"
 
diff --git a/tests/unit/distributed_updates.cpp b/tests/unit/distributed_updates.cpp
index 96a6fd960..48fe0cddc 100644
--- a/tests/unit/distributed_updates.cpp
+++ b/tests/unit/distributed_updates.cpp
@@ -7,7 +7,7 @@
 #include "distributed/updates_rpc_clients.hpp"
 #include "distributed/updates_rpc_server.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 
 #include "distributed_common.hpp"
 
diff --git a/tests/unit/graph_db.cpp b/tests/unit/graph_db.cpp
index b7f040396..a558bc633 100644
--- a/tests/unit/graph_db.cpp
+++ b/tests/unit/graph_db.cpp
@@ -4,7 +4,7 @@
 
 #include "database/single_node/graph_db.hpp"
 #include "database/single_node/graph_db_accessor.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/indexes/label_property_index.hpp"
 
 TEST(GraphDbTest, GarbageCollectIndices) {
diff --git a/tests/unit/graph_db_accessor.cpp b/tests/unit/graph_db_accessor.cpp
index c2c323b42..3475ef36b 100644
--- a/tests/unit/graph_db_accessor.cpp
+++ b/tests/unit/graph_db_accessor.cpp
@@ -4,7 +4,7 @@
 
 #include "database/single_node/graph_db.hpp"
 #include "database/single_node/graph_db_accessor.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/edge_accessor.hpp"
 #include "storage/vertex_accessor.hpp"
 
diff --git a/tests/unit/kvstore.cpp b/tests/unit/kvstore.cpp
index b2e96cac9..05a6207eb 100644
--- a/tests/unit/kvstore.cpp
+++ b/tests/unit/kvstore.cpp
@@ -3,7 +3,7 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "utils/file.hpp"
 
 namespace fs = std::experimental::filesystem;
diff --git a/tests/unit/mvcc.cpp b/tests/unit/mvcc.cpp
index bc88f07d6..9eedf07e7 100644
--- a/tests/unit/mvcc.cpp
+++ b/tests/unit/mvcc.cpp
@@ -2,9 +2,9 @@
 
 #include <gtest/gtest.h>
 
-#include "mvcc/common/version.hpp"
-#include "mvcc/single_node/record.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/common/mvcc/version.hpp"
+#include "storage/single_node/mvcc/record.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "transactions/single_node/engine.hpp"
 #include "transactions/transaction.hpp"
 #include "utils/thread/sync.hpp"
diff --git a/tests/unit/mvcc_find_update_common.hpp b/tests/unit/mvcc_find_update_common.hpp
index f5d29b7ae..860dd2dab 100644
--- a/tests/unit/mvcc_find_update_common.hpp
+++ b/tests/unit/mvcc_find_update_common.hpp
@@ -2,9 +2,9 @@
 
 #include <gtest/gtest.h>
 
-#include "mvcc/common/version.hpp"
-#include "mvcc/single_node/record.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/common/mvcc/version.hpp"
+#include "storage/single_node/mvcc/record.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "transactions/single_node/engine.hpp"
 #include "transactions/transaction.hpp"
 
diff --git a/tests/unit/mvcc_gc.cpp b/tests/unit/mvcc_gc.cpp
index 50e3d133a..65aef5d94 100644
--- a/tests/unit/mvcc_gc.cpp
+++ b/tests/unit/mvcc_gc.cpp
@@ -7,8 +7,8 @@
 #include <gtest/gtest.h>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node/record.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/single_node/mvcc/record.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "storage/single_node/garbage_collector.hpp"
 #include "storage/single_node/vertex.hpp"
 #include "transactions/single_node/engine.hpp"
diff --git a/tests/unit/mvcc_gc_common.hpp b/tests/unit/mvcc_gc_common.hpp
index d4386ddc6..39e09f6fa 100644
--- a/tests/unit/mvcc_gc_common.hpp
+++ b/tests/unit/mvcc_gc_common.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "mvcc/single_node/record.hpp"
+#include "storage/single_node/mvcc/record.hpp"
 #include "transactions/single_node/engine.hpp"
 
 /**
diff --git a/tests/unit/property_value_store.cpp b/tests/unit/property_value_store.cpp
index 02f1f2ac5..191cdd9bf 100644
--- a/tests/unit/property_value_store.cpp
+++ b/tests/unit/property_value_store.cpp
@@ -4,8 +4,8 @@
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
-#include "storage/common/property_value.hpp"
-#include "storage/common/property_value_store.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/property_value_store.hpp"
 #include "utils/file.hpp"
 
 using Location = storage::Location;
diff --git a/tests/unit/query_common.hpp b/tests/unit/query_common.hpp
index 263dd4006..644707540 100644
--- a/tests/unit/query_common.hpp
+++ b/tests/unit/query_common.hpp
@@ -30,7 +30,7 @@
 #include <vector>
 
 #include "query/frontend/ast/ast.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/string.hpp"
 
 namespace query {
diff --git a/tests/unit/query_expression_evaluator.cpp b/tests/unit/query_expression_evaluator.cpp
index 80035a5ae..87b58e4d5 100644
--- a/tests/unit/query_expression_evaluator.cpp
+++ b/tests/unit/query_expression_evaluator.cpp
@@ -15,7 +15,7 @@
 #include "query/interpret/eval.hpp"
 #include "query/interpret/frame.hpp"
 #include "query/path.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/string.hpp"
 
 #include "query_common.hpp"
diff --git a/tests/unit/query_required_privileges.cpp b/tests/unit/query_required_privileges.cpp
index ad2e9348d..83624ee06 100644
--- a/tests/unit/query_required_privileges.cpp
+++ b/tests/unit/query_required_privileges.cpp
@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 #include "query/frontend/semantic/required_privileges.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 
 #include "query_common.hpp"
 
diff --git a/tests/unit/record_edge_vertex_accessor.cpp b/tests/unit/record_edge_vertex_accessor.cpp
index 03d83b961..2ceecfddb 100644
--- a/tests/unit/record_edge_vertex_accessor.cpp
+++ b/tests/unit/record_edge_vertex_accessor.cpp
@@ -5,8 +5,8 @@
 
 #include "database/single_node/graph_db.hpp"
 #include "database/single_node/graph_db_accessor.hpp"
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/property_value.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
 #include "storage/single_node/edge_accessor.hpp"
 #include "storage/single_node/vertex.hpp"
 #include "storage/single_node/vertex_accessor.hpp"