diff --git a/BUILD.bazel b/BUILD.bazel
index 27af8796f..9c87666b8 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -269,26 +269,26 @@ PLASMA_LINKOPTS = [] + select({
 cc_library(
     name = "plasma_client",
     srcs = [
-        "src/ray/plasma/client.cc",
-        "src/ray/plasma/common.cc",
-        "src/ray/plasma/fling.cc",
-        "src/ray/plasma/io.cc",
-        "src/ray/plasma/malloc.cc",
-        "src/ray/plasma/plasma.cc",
-        "src/ray/plasma/protocol.cc",
+        "src/ray/object_manager/plasma/client.cc",
+        "src/ray/object_manager/plasma/common.cc",
+        "src/ray/object_manager/plasma/fling.cc",
+        "src/ray/object_manager/plasma/io.cc",
+        "src/ray/object_manager/plasma/malloc.cc",
+        "src/ray/object_manager/plasma/plasma.cc",
+        "src/ray/object_manager/plasma/protocol.cc",
     ],
     hdrs = [
-        "src/ray/plasma/client.h",
-        "src/ray/plasma/common.h",
-        "src/ray/plasma/common_generated.h",
-        "src/ray/plasma/compat.h",
-        "src/ray/plasma/external_store.h",
-        "src/ray/plasma/fling.h",
-        "src/ray/plasma/io.h",
-        "src/ray/plasma/malloc.h",
-        "src/ray/plasma/plasma.h",
-        "src/ray/plasma/plasma_generated.h",
-        "src/ray/plasma/protocol.h",
+        "src/ray/object_manager/plasma/client.h",
+        "src/ray/object_manager/plasma/common.h",
+        "src/ray/object_manager/plasma/common_generated.h",
+        "src/ray/object_manager/plasma/compat.h",
+        "src/ray/object_manager/plasma/external_store.h",
+        "src/ray/object_manager/plasma/fling.h",
+        "src/ray/object_manager/plasma/io.h",
+        "src/ray/object_manager/plasma/malloc.h",
+        "src/ray/object_manager/plasma/plasma.h",
+        "src/ray/object_manager/plasma/plasma_generated.h",
+        "src/ray/object_manager/plasma/protocol.h",
     ],
     copts = PLASMA_COPTS,
     defines = select({
@@ -296,7 +296,7 @@ cc_library(
         "//conditions:default": [],
     }),
     linkopts = PLASMA_LINKOPTS,
-    strip_include_prefix = "src/ray",
+    strip_include_prefix = "src",
     deps = [
         ":common_fbs",
         ":plasma_fbs",
@@ -309,15 +309,13 @@ cc_library(
 cc_binary(
     name = "libplasma_java.so",
     srcs = [
-        "src/ray/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc",
-        "src/ray/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.h",
+        "src/ray/object_manager/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc",
+        "src/ray/object_manager/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.h",
         ":jni.h",
         ":jni_md.h",
     ],
     copts = PLASMA_COPTS,
-    includes = [
-        "src/ray",
-    ],
+    includes = ["src/ray/object_manager/plasma/lib/java"],
     linkshared = 1,
     linkstatic = 1,
     deps = [":plasma_client"],
@@ -352,22 +350,19 @@ genrule(
 cc_library(
     name = "ae",
     srcs = [
-        "src/ray/plasma/thirdparty/ae/ae.c",
+        "src/ray/thirdparty/ae/ae.c",
     ],
     hdrs = [
-        "src/ray/plasma/thirdparty/ae/ae.h",
-        "src/ray/plasma/thirdparty/ae/ae_epoll.c",
-        "src/ray/plasma/thirdparty/ae/ae_evport.c",
-        "src/ray/plasma/thirdparty/ae/ae_kqueue.c",
-        "src/ray/plasma/thirdparty/ae/ae_select.c",
-        "src/ray/plasma/thirdparty/ae/config.h",
-        "src/ray/plasma/thirdparty/ae/zmalloc.h",
+        "src/ray/thirdparty/ae/ae.h",
+        "src/ray/thirdparty/ae/ae_epoll.c",
+        "src/ray/thirdparty/ae/ae_evport.c",
+        "src/ray/thirdparty/ae/ae_kqueue.c",
+        "src/ray/thirdparty/ae/ae_select.c",
+        "src/ray/thirdparty/ae/config.h",
+        "src/ray/thirdparty/ae/zmalloc.h",
     ],
     copts = PLASMA_COPTS,
-    includes = [
-        "src/ray/plasma/thirdparty/ae",
-    ],
-    strip_include_prefix = "src/ray",
+    strip_include_prefix = "src",
     deps = [
         ":platform_shims",
     ],
@@ -376,26 +371,26 @@ cc_library(
 cc_library(
     name = "plasma_store_server_lib",
     srcs = [
-        "src/ray/plasma/dlmalloc.cc",
-        "src/ray/plasma/events.cc",
-        "src/ray/plasma/eviction_policy.cc",
-        "src/ray/plasma/external_store.cc",
-        "src/ray/plasma/plasma_allocator.cc",
-        "src/ray/plasma/quota_aware_policy.cc",
-        "src/ray/plasma/store.cc",
+        "src/ray/object_manager/plasma/dlmalloc.cc",
+        "src/ray/object_manager/plasma/events.cc",
+        "src/ray/object_manager/plasma/eviction_policy.cc",
+        "src/ray/object_manager/plasma/external_store.cc",
+        "src/ray/object_manager/plasma/plasma_allocator.cc",
+        "src/ray/object_manager/plasma/quota_aware_policy.cc",
+        "src/ray/object_manager/plasma/store.cc",
     ],
     hdrs = [
-        "src/ray/plasma/events.h",
-        "src/ray/plasma/eviction_policy.h",
-        "src/ray/plasma/external_store.h",
-        "src/ray/plasma/plasma_allocator.h",
-        "src/ray/plasma/quota_aware_policy.h",
-        "src/ray/plasma/store.h",
-        "src/ray/plasma/thirdparty/dlmalloc.c",
+        "src/ray/object_manager/plasma/events.h",
+        "src/ray/object_manager/plasma/eviction_policy.h",
+        "src/ray/object_manager/plasma/external_store.h",
+        "src/ray/object_manager/plasma/plasma_allocator.h",
+        "src/ray/object_manager/plasma/quota_aware_policy.h",
+        "src/ray/object_manager/plasma/store.h",
+        "src/ray/thirdparty/dlmalloc.c",
     ],
     copts = PLASMA_COPTS,
     linkopts = PLASMA_LINKOPTS,
-    strip_include_prefix = "src/ray",
+    strip_include_prefix = "src",
     deps = [
         ":ae",
         ":plasma_client",
@@ -425,17 +420,17 @@ FLATC_ARGS = [
 
 flatbuffer_cc_library(
     name = "common_fbs",
-    srcs = ["src/ray/plasma/common.fbs"],
+    srcs = ["src/ray/object_manager/plasma/common.fbs"],
     flatc_args = FLATC_ARGS,
-    out_prefix = "src/ray/plasma/",
+    out_prefix = "src/ray/object_manager/plasma/",
 )
 
 flatbuffer_cc_library(
     name = "plasma_fbs",
-    srcs = ["src/ray/plasma/plasma.fbs"],
+    srcs = ["src/ray/object_manager/plasma/plasma.fbs"],
     flatc_args = FLATC_ARGS,
-    includes = ["src/ray/plasma/common.fbs"],
-    out_prefix = "src/ray/plasma/",
+    includes = ["src/ray/object_manager/plasma/common.fbs"],
+    out_prefix = "src/ray/object_manager/plasma/",
 )
 
 # === End of plasma definitions ===
diff --git a/src/ray/common/buffer.h b/src/ray/common/buffer.h
index 7ed5db25a..94c630855 100644
--- a/src/ray/common/buffer.h
+++ b/src/ray/common/buffer.h
@@ -17,8 +17,9 @@
 
 #include <cstdint>
 #include <cstdio>
-#include "plasma/client.h"
+
 #include "ray/common/status.h"
+#include "ray/object_manager/plasma/client.h"
 
 namespace arrow {
 class Buffer;
diff --git a/src/ray/common/id.h b/src/ray/common/id.h
index c8efb9d5c..ab222f3c9 100644
--- a/src/ray/common/id.h
+++ b/src/ray/common/id.h
@@ -25,8 +25,8 @@
 #include <random>
 #include <string>
 
-#include "plasma/common.h"
 #include "ray/common/constants.h"
+#include "ray/object_manager/plasma/common.h"
 #include "ray/util/logging.h"
 #include "ray/util/util.h"
 #include "ray/util/visibility.h"
diff --git a/src/ray/core_worker/store_provider/plasma_store_provider.h b/src/ray/core_worker/store_provider/plasma_store_provider.h
index ede38c244..f2936763a 100644
--- a/src/ray/core_worker/store_provider/plasma_store_provider.h
+++ b/src/ray/core_worker/store_provider/plasma_store_provider.h
@@ -17,12 +17,12 @@
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
-#include "plasma/client.h"
 #include "ray/common/buffer.h"
 #include "ray/common/id.h"
 #include "ray/common/status.h"
 #include "ray/core_worker/common.h"
 #include "ray/core_worker/context.h"
+#include "ray/object_manager/plasma/client.h"
 #include "ray/raylet/raylet_client.h"
 
 namespace ray {
diff --git a/src/ray/object_manager/object_buffer_pool.h b/src/ray/object_manager/object_buffer_pool.h
index b244633e4..aea4ec62d 100644
--- a/src/ray/object_manager/object_buffer_pool.h
+++ b/src/ray/object_manager/object_buffer_pool.h
@@ -24,10 +24,11 @@
 #include <boost/asio/error.hpp>
 #include <boost/bind.hpp>
 
-#include "plasma/client.h"
+#include "ray/object_manager/plasma/client.h"
 
 #include "ray/common/id.h"
 #include "ray/common/status.h"
+#include "ray/object_manager/plasma/client.h"
 
 namespace ray {
 
diff --git a/src/ray/object_manager/object_directory.h b/src/ray/object_manager/object_directory.h
index dd337e99e..47e287418 100644
--- a/src/ray/object_manager/object_directory.h
+++ b/src/ray/object_manager/object_directory.h
@@ -21,12 +21,11 @@
 #include <unordered_set>
 #include <vector>
 
-#include "plasma/client.h"
-
 #include "ray/common/id.h"
 #include "ray/common/status.h"
 #include "ray/gcs/redis_gcs_client.h"
 #include "ray/object_manager/format/object_manager_generated.h"
+#include "ray/object_manager/plasma/client.h"
 
 namespace ray {
 
diff --git a/src/ray/object_manager/object_manager.h b/src/ray/object_manager/object_manager.h
index eb70cc86e..a06100198 100644
--- a/src/ray/object_manager/object_manager.h
+++ b/src/ray/object_manager/object_manager.h
@@ -29,16 +29,14 @@
 #include <boost/bind.hpp>
 
 #include "absl/time/clock.h"
-#include "plasma/client.h"
-
 #include "ray/common/id.h"
 #include "ray/common/ray_config.h"
 #include "ray/common/status.h"
-
 #include "ray/object_manager/format/object_manager_generated.h"
 #include "ray/object_manager/object_buffer_pool.h"
 #include "ray/object_manager/object_directory.h"
 #include "ray/object_manager/object_store_notification_manager.h"
+#include "ray/object_manager/plasma/client.h"
 #include "ray/rpc/object_manager/object_manager_client.h"
 #include "ray/rpc/object_manager/object_manager_server.h"
 
diff --git a/src/ray/object_manager/object_store_notification_manager.h b/src/ray/object_manager/object_store_notification_manager.h
index 7565d63e9..11e351dcc 100644
--- a/src/ray/object_manager/object_store_notification_manager.h
+++ b/src/ray/object_manager/object_store_notification_manager.h
@@ -23,13 +23,13 @@
 #include <boost/asio/error.hpp>
 #include <boost/bind.hpp>
 
-#include "plasma/client.h"
+#include "ray/object_manager/plasma/client.h"
 
 #include "ray/common/client_connection.h"
 #include "ray/common/id.h"
 #include "ray/common/status.h"
-
 #include "ray/object_manager/object_directory.h"
+#include "ray/object_manager/plasma/client.h"
 
 namespace ray {
 
diff --git a/src/ray/plasma/.clang-format b/src/ray/object_manager/plasma/.clang-format
similarity index 100%
rename from src/ray/plasma/.clang-format
rename to src/ray/object_manager/plasma/.clang-format
diff --git a/src/ray/plasma/.gitignore b/src/ray/object_manager/plasma/.gitignore
similarity index 100%
rename from src/ray/plasma/.gitignore
rename to src/ray/object_manager/plasma/.gitignore
diff --git a/src/ray/plasma/client.cc b/src/ray/object_manager/plasma/client.cc
similarity index 99%
rename from src/ray/plasma/client.cc
rename to src/ray/object_manager/plasma/client.cc
index 76c80783a..2ae38e57c 100644
--- a/src/ray/plasma/client.cc
+++ b/src/ray/object_manager/plasma/client.cc
@@ -17,7 +17,7 @@
 
 // PLASMA CLIENT: Client library for using the plasma store and manager
 
-#include "plasma/client.h"
+#include "ray/object_manager/plasma/client.h"
 
 #include <fcntl.h>
 #include <netinet/in.h>
@@ -49,12 +49,12 @@
 #include "arrow/buffer.h"
 #include "arrow/util/thread_pool.h"
 
-#include "plasma/common.h"
-#include "plasma/fling.h"
-#include "plasma/io.h"
-#include "plasma/malloc.h"
-#include "plasma/plasma.h"
-#include "plasma/protocol.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/fling.h"
+#include "ray/object_manager/plasma/io.h"
+#include "ray/object_manager/plasma/malloc.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/protocol.h"
 
 #ifdef PLASMA_CUDA
 #include "arrow/gpu/cuda_api.h"
diff --git a/src/ray/plasma/client.h b/src/ray/object_manager/plasma/client.h
similarity index 99%
rename from src/ray/plasma/client.h
rename to src/ray/object_manager/plasma/client.h
index 76d04a801..a701221bb 100644
--- a/src/ray/plasma/client.h
+++ b/src/ray/object_manager/plasma/client.h
@@ -27,7 +27,7 @@
 #include "arrow/status.h"
 #include "arrow/util/macros.h"
 #include "arrow/util/visibility.h"
-#include "plasma/common.h"
+#include "ray/object_manager/plasma/common.h"
 
 using arrow::Buffer;
 using arrow::Status;
diff --git a/src/ray/plasma/common.cc b/src/ray/object_manager/plasma/common.cc
similarity index 98%
rename from src/ray/plasma/common.cc
rename to src/ray/object_manager/plasma/common.cc
index bbcd2c9c3..7dd45f01f 100644
--- a/src/ray/plasma/common.cc
+++ b/src/ray/object_manager/plasma/common.cc
@@ -15,14 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "plasma/common.h"
+#include "ray/object_manager/plasma/common.h"
 
 #include <limits>
 #include <utility>
 
 #include "arrow/util/ubsan.h"
 
-#include "plasma/plasma_generated.h"
+#include "ray/object_manager/plasma/plasma_generated.h"
 
 namespace fb = plasma::flatbuf;
 
diff --git a/src/ray/plasma/common.fbs b/src/ray/object_manager/plasma/common.fbs
similarity index 100%
rename from src/ray/plasma/common.fbs
rename to src/ray/object_manager/plasma/common.fbs
diff --git a/src/ray/plasma/common.h b/src/ray/object_manager/plasma/common.h
similarity index 95%
rename from src/ray/plasma/common.h
rename to src/ray/object_manager/plasma/common.h
index d42840cfb..d77b177ae 100644
--- a/src/ray/plasma/common.h
+++ b/src/ray/object_manager/plasma/common.h
@@ -20,17 +20,11 @@
 
 #include <stddef.h>
 
-#include <cstring>
 #include <memory>
 #include <string>
-// TODO(pcm): Convert getopt and sscanf in the store to use more idiomatic C++
-// and get rid of the next three lines:
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
 #include <unordered_map>
 
-#include "plasma/compat.h"
+#include "ray/object_manager/plasma/compat.h"
 
 #include "arrow/status.h"
 #ifdef PLASMA_CUDA
diff --git a/src/ray/plasma/compat.h b/src/ray/object_manager/plasma/compat.h
similarity index 100%
rename from src/ray/plasma/compat.h
rename to src/ray/object_manager/plasma/compat.h
diff --git a/src/ray/plasma/dlmalloc.cc b/src/ray/object_manager/plasma/dlmalloc.cc
similarity index 96%
rename from src/ray/plasma/dlmalloc.cc
rename to src/ray/object_manager/plasma/dlmalloc.cc
index eb37df827..27c8e704c 100644
--- a/src/ray/plasma/dlmalloc.cc
+++ b/src/ray/object_manager/plasma/dlmalloc.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "plasma/malloc.h"
+#include "ray/object_manager/plasma/malloc.h"
 
 #include <assert.h>
 #include <stddef.h>
@@ -32,8 +32,8 @@
 #include <string>
 #include <vector>
 
-#include "plasma/common.h"
-#include "plasma/plasma.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma.h"
 
 namespace plasma {
 
@@ -49,7 +49,7 @@ int fake_munmap(void*, int64_t);
 #define DEFAULT_MMAP_THRESHOLD MAX_SIZE_T
 #define DEFAULT_GRANULARITY ((size_t)128U * 1024U)
 
-#include "plasma/thirdparty/dlmalloc.c"  // NOLINT
+#include "ray/thirdparty/dlmalloc.c"  // NOLINT
 
 #undef MMAP
 #undef MUNMAP
diff --git a/src/ray/plasma/events.cc b/src/ray/object_manager/plasma/events.cc
similarity index 97%
rename from src/ray/plasma/events.cc
rename to src/ray/object_manager/plasma/events.cc
index 28ff12675..027bc0de3 100644
--- a/src/ray/plasma/events.cc
+++ b/src/ray/object_manager/plasma/events.cc
@@ -15,14 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "plasma/events.h"
+#include "ray/object_manager/plasma/events.h"
 
 #include <utility>
 
 #include <errno.h>
 
 extern "C" {
-#include "plasma/thirdparty/ae/ae.h"
+#include "ray/thirdparty/ae/ae.h"
 }
 
 namespace plasma {
diff --git a/src/ray/plasma/events.h b/src/ray/object_manager/plasma/events.h
similarity index 100%
rename from src/ray/plasma/events.h
rename to src/ray/object_manager/plasma/events.h
diff --git a/src/ray/plasma/eviction_policy.cc b/src/ray/object_manager/plasma/eviction_policy.cc
similarity index 98%
rename from src/ray/plasma/eviction_policy.cc
rename to src/ray/object_manager/plasma/eviction_policy.cc
index c3b786785..8611cafa1 100644
--- a/src/ray/plasma/eviction_policy.cc
+++ b/src/ray/object_manager/plasma/eviction_policy.cc
@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "plasma/eviction_policy.h"
-#include "plasma/plasma_allocator.h"
+#include "ray/object_manager/plasma/eviction_policy.h"
+#include "ray/object_manager/plasma/plasma_allocator.h"
 
 #include <algorithm>
 #include <sstream>
diff --git a/src/ray/plasma/eviction_policy.h b/src/ray/object_manager/plasma/eviction_policy.h
similarity index 98%
rename from src/ray/plasma/eviction_policy.h
rename to src/ray/object_manager/plasma/eviction_policy.h
index b2496d9aa..10ea94013 100644
--- a/src/ray/plasma/eviction_policy.h
+++ b/src/ray/object_manager/plasma/eviction_policy.h
@@ -25,8 +25,8 @@
 #include <utility>
 #include <vector>
 
-#include "plasma/common.h"
-#include "plasma/plasma.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/external_store.cc b/src/ray/object_manager/plasma/external_store.cc
similarity index 97%
rename from src/ray/plasma/external_store.cc
rename to src/ray/object_manager/plasma/external_store.cc
index 8cfbad179..f6ed31ea3 100644
--- a/src/ray/plasma/external_store.cc
+++ b/src/ray/object_manager/plasma/external_store.cc
@@ -20,7 +20,7 @@
 
 #include "arrow/util/memory.h"
 
-#include "plasma/external_store.h"
+#include "ray/object_manager/plasma/external_store.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/external_store.h b/src/ray/object_manager/plasma/external_store.h
similarity index 99%
rename from src/ray/plasma/external_store.h
rename to src/ray/object_manager/plasma/external_store.h
index feca46658..2be27d5ca 100644
--- a/src/ray/plasma/external_store.h
+++ b/src/ray/object_manager/plasma/external_store.h
@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "plasma/client.h"
+#include "ray/object_manager/plasma/client.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/fling.cc b/src/ray/object_manager/plasma/fling.cc
similarity index 99%
rename from src/ray/plasma/fling.cc
rename to src/ray/object_manager/plasma/fling.cc
index fa16d357d..8cd3a84b2 100644
--- a/src/ray/plasma/fling.cc
+++ b/src/ray/object_manager/plasma/fling.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "plasma/fling.h"
+#include "ray/object_manager/plasma/fling.h"
 
 #include <string.h>
 
diff --git a/src/ray/plasma/fling.h b/src/ray/object_manager/plasma/fling.h
similarity index 100%
rename from src/ray/plasma/fling.h
rename to src/ray/object_manager/plasma/fling.h
diff --git a/src/ray/plasma/hash_table_store.cc b/src/ray/object_manager/plasma/hash_table_store.cc
similarity index 97%
rename from src/ray/plasma/hash_table_store.cc
rename to src/ray/object_manager/plasma/hash_table_store.cc
index b77d3693f..251d39db1 100644
--- a/src/ray/plasma/hash_table_store.cc
+++ b/src/ray/object_manager/plasma/hash_table_store.cc
@@ -20,7 +20,7 @@
 
 #include "arrow/util/logging.h"
 
-#include "plasma/hash_table_store.h"
+#include "ray/object_manager/plasma/hash_table_store.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/hash_table_store.h b/src/ray/object_manager/plasma/hash_table_store.h
similarity index 96%
rename from src/ray/plasma/hash_table_store.h
rename to src/ray/object_manager/plasma/hash_table_store.h
index 766088bd4..94335af26 100644
--- a/src/ray/plasma/hash_table_store.h
+++ b/src/ray/object_manager/plasma/hash_table_store.h
@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "plasma/external_store.h"
+#include "ray/object_manager/plasma/external_store.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/io.cc b/src/ray/object_manager/plasma/io.cc
similarity index 98%
rename from src/ray/plasma/io.cc
rename to src/ray/object_manager/plasma/io.cc
index 1676596ea..cc0fdc973 100644
--- a/src/ray/plasma/io.cc
+++ b/src/ray/object_manager/plasma/io.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "plasma/io.h"
+#include "ray/object_manager/plasma/io.h"
 
 #include <cstdint>
 #include <memory>
@@ -24,8 +24,8 @@
 #include "arrow/status.h"
 #include "arrow/util/logging.h"
 
-#include "plasma/common.h"
-#include "plasma/plasma_generated.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma_generated.h"
 #ifndef _WIN32
 #include <arpa/inet.h>
 #include <netinet/in.h>
diff --git a/src/ray/plasma/io.h b/src/ray/object_manager/plasma/io.h
similarity index 95%
rename from src/ray/plasma/io.h
rename to src/ray/object_manager/plasma/io.h
index 4e480982c..08cfc0d83 100644
--- a/src/ray/plasma/io.h
+++ b/src/ray/object_manager/plasma/io.h
@@ -28,8 +28,8 @@
 #include <vector>
 
 #include "arrow/status.h"
-#include "plasma/common.h"
-#include "plasma/compat.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/compat.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc b/src/ray/object_manager/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc
similarity index 98%
rename from src/ray/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc
rename to src/ray/object_manager/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc
index 0964df46f..3ff34069c 100644
--- a/src/ray/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc
+++ b/src/ray/object_manager/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.h"
+#include "org_apache_arrow_plasma_PlasmaClientJNI.h"
 
 #include <pthread.h>
 #include <stdlib.h>
@@ -30,7 +30,7 @@
 
 #include "arrow/util/logging.h"
 
-#include "plasma/client.h"
+#include "ray/object_manager/plasma/client.h"
 
 constexpr jsize OBJECT_ID_SIZE = sizeof(plasma::ObjectID) / sizeof(jbyte);
 
diff --git a/src/ray/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.h b/src/ray/object_manager/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.h
similarity index 100%
rename from src/ray/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.h
rename to src/ray/object_manager/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.h
diff --git a/src/ray/plasma/malloc.cc b/src/ray/object_manager/plasma/malloc.cc
similarity index 93%
rename from src/ray/plasma/malloc.cc
rename to src/ray/object_manager/plasma/malloc.cc
index fe9efc4c3..4160d4e9c 100644
--- a/src/ray/plasma/malloc.cc
+++ b/src/ray/object_manager/plasma/malloc.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "plasma/malloc.h"
+#include "ray/object_manager/plasma/malloc.h"
 
 #include <assert.h>
 #include <stddef.h>
@@ -27,8 +27,8 @@
 #include <string>
 #include <vector>
 
-#include "plasma/common.h"
-#include "plasma/plasma.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/malloc.h b/src/ray/object_manager/plasma/malloc.h
similarity index 100%
rename from src/ray/plasma/malloc.h
rename to src/ray/object_manager/plasma/malloc.h
diff --git a/src/ray/plasma/plasma.cc b/src/ray/object_manager/plasma/plasma.cc
similarity index 94%
rename from src/ray/plasma/plasma.cc
rename to src/ray/object_manager/plasma/plasma.cc
index 6f38951fb..55c2066cd 100644
--- a/src/ray/plasma/plasma.cc
+++ b/src/ray/object_manager/plasma/plasma.cc
@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "plasma/plasma.h"
+#include "ray/object_manager/plasma/plasma.h"
 
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "plasma/common.h"
-#include "plasma/common_generated.h"
-#include "plasma/protocol.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/common_generated.h"
+#include "ray/object_manager/plasma/protocol.h"
 
 namespace fb = plasma::flatbuf;
 
diff --git a/src/ray/plasma/plasma.fbs b/src/ray/object_manager/plasma/plasma.fbs
similarity index 100%
rename from src/ray/plasma/plasma.fbs
rename to src/ray/object_manager/plasma/plasma.fbs
diff --git a/src/ray/plasma/plasma.h b/src/ray/object_manager/plasma/plasma.h
similarity index 98%
rename from src/ray/plasma/plasma.h
rename to src/ray/object_manager/plasma/plasma.h
index 5b49563b3..a0d203be9 100644
--- a/src/ray/plasma/plasma.h
+++ b/src/ray/object_manager/plasma/plasma.h
@@ -32,12 +32,12 @@
 #include <unordered_set>
 #include <vector>
 
-#include "plasma/compat.h"
+#include "ray/object_manager/plasma/compat.h"
 
 #include "arrow/status.h"
 #include "arrow/util/logging.h"
 #include "arrow/util/macros.h"
-#include "plasma/common.h"
+#include "ray/object_manager/plasma/common.h"
 
 #ifdef PLASMA_CUDA
 using arrow::cuda::CudaIpcMemHandle;
diff --git a/src/ray/plasma/plasma_allocator.cc b/src/ray/object_manager/plasma/plasma_allocator.cc
similarity index 94%
rename from src/ray/plasma/plasma_allocator.cc
rename to src/ray/object_manager/plasma/plasma_allocator.cc
index b67eeea40..82ec4c54b 100644
--- a/src/ray/plasma/plasma_allocator.cc
+++ b/src/ray/object_manager/plasma/plasma_allocator.cc
@@ -17,8 +17,8 @@
 
 #include <arrow/util/logging.h>
 
-#include "plasma/malloc.h"
-#include "plasma/plasma_allocator.h"
+#include "ray/object_manager/plasma/malloc.h"
+#include "ray/object_manager/plasma/plasma_allocator.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/plasma_allocator.h b/src/ray/object_manager/plasma/plasma_allocator.h
similarity index 100%
rename from src/ray/plasma/plasma_allocator.h
rename to src/ray/object_manager/plasma/plasma_allocator.h
diff --git a/src/ray/plasma/protocol.cc b/src/ray/object_manager/plasma/protocol.cc
similarity index 99%
rename from src/ray/plasma/protocol.cc
rename to src/ray/object_manager/plasma/protocol.cc
index 15614f012..982627bd3 100644
--- a/src/ray/plasma/protocol.cc
+++ b/src/ray/object_manager/plasma/protocol.cc
@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "plasma/protocol.h"
+#include "ray/object_manager/plasma/protocol.h"
 
 #include <utility>
 
 #include "flatbuffers/flatbuffers.h"
 
-#include "plasma/common.h"
-#include "plasma/io.h"
-#include "plasma/plasma_generated.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/io.h"
+#include "ray/object_manager/plasma/plasma_generated.h"
 
 #ifdef PLASMA_CUDA
 #include "arrow/gpu/cuda_api.h"
diff --git a/src/ray/plasma/protocol.h b/src/ray/object_manager/plasma/protocol.h
similarity index 98%
rename from src/ray/plasma/protocol.h
rename to src/ray/object_manager/plasma/protocol.h
index 37d03a0f2..392dae804 100644
--- a/src/ray/plasma/protocol.h
+++ b/src/ray/object_manager/plasma/protocol.h
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include "arrow/status.h"
-#include "plasma/plasma.h"
-#include "plasma/plasma_generated.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/plasma_generated.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/quota_aware_policy.cc b/src/ray/object_manager/plasma/quota_aware_policy.cc
similarity index 97%
rename from src/ray/plasma/quota_aware_policy.cc
rename to src/ray/object_manager/plasma/quota_aware_policy.cc
index 67c4e9248..67a6cb943 100644
--- a/src/ray/plasma/quota_aware_policy.cc
+++ b/src/ray/object_manager/plasma/quota_aware_policy.cc
@@ -15,9 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "plasma/quota_aware_policy.h"
-#include "plasma/common.h"
-#include "plasma/plasma_allocator.h"
+#include "ray/object_manager/plasma/quota_aware_policy.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma_allocator.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/src/ray/plasma/quota_aware_policy.h b/src/ray/object_manager/plasma/quota_aware_policy.h
similarity index 96%
rename from src/ray/plasma/quota_aware_policy.h
rename to src/ray/object_manager/plasma/quota_aware_policy.h
index 953f0bcdd..0700c9322 100644
--- a/src/ray/plasma/quota_aware_policy.h
+++ b/src/ray/object_manager/plasma/quota_aware_policy.h
@@ -26,9 +26,9 @@
 #include <utility>
 #include <vector>
 
-#include "plasma/common.h"
-#include "plasma/eviction_policy.h"
-#include "plasma/plasma.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/eviction_policy.h"
+#include "ray/object_manager/plasma/plasma.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/store.cc b/src/ray/object_manager/plasma/store.cc
similarity index 99%
rename from src/ray/plasma/store.cc
rename to src/ray/object_manager/plasma/store.cc
index f0f090e19..77baa81c8 100644
--- a/src/ray/plasma/store.cc
+++ b/src/ray/object_manager/plasma/store.cc
@@ -26,7 +26,7 @@
 // It keeps a hash table that maps object_ids (which are 20 byte long,
 // just enough to store and SHA1 hash) to memory mapped files.
 
-#include "plasma/store.h"
+#include "ray/object_manager/plasma/store.h"
 
 #include <assert.h>
 #include <fcntl.h>
@@ -50,13 +50,13 @@
 
 #include "arrow/status.h"
 
-#include "plasma/common.h"
-#include "plasma/common_generated.h"
-#include "plasma/fling.h"
-#include "plasma/io.h"
-#include "plasma/malloc.h"
-#include "plasma/plasma_allocator.h"
-#include "plasma/protocol.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/common_generated.h"
+#include "ray/object_manager/plasma/fling.h"
+#include "ray/object_manager/plasma/io.h"
+#include "ray/object_manager/plasma/malloc.h"
+#include "ray/object_manager/plasma/plasma_allocator.h"
+#include "ray/object_manager/plasma/protocol.h"
 
 #ifdef PLASMA_CUDA
 #include "arrow/gpu/cuda_api.h"
diff --git a/src/ray/plasma/store.h b/src/ray/object_manager/plasma/store.h
similarity index 97%
rename from src/ray/plasma/store.h
rename to src/ray/object_manager/plasma/store.h
index 9ce620c14..14aeafb52 100644
--- a/src/ray/plasma/store.h
+++ b/src/ray/object_manager/plasma/store.h
@@ -25,12 +25,12 @@
 #include <unordered_set>
 #include <vector>
 
-#include "plasma/common.h"
-#include "plasma/events.h"
-#include "plasma/external_store.h"
-#include "plasma/plasma.h"
-#include "plasma/protocol.h"
-#include "plasma/quota_aware_policy.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/events.h"
+#include "ray/object_manager/plasma/external_store.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/protocol.h"
+#include "ray/object_manager/plasma/quota_aware_policy.h"
 
 namespace arrow {
 class Status;
diff --git a/src/ray/plasma/test/client_tests.cc b/src/ray/object_manager/plasma/test/client_tests.cc
similarity index 99%
rename from src/ray/plasma/test/client_tests.cc
rename to src/ray/object_manager/plasma/test/client_tests.cc
index a3cd8e4f2..a0672f7b4 100644
--- a/src/ray/plasma/test/client_tests.cc
+++ b/src/ray/object_manager/plasma/test/client_tests.cc
@@ -30,11 +30,11 @@
 #include "arrow/testing/gtest_util.h"
 #include "arrow/util/io_util.h"
 
-#include "plasma/client.h"
-#include "plasma/common.h"
-#include "plasma/plasma.h"
-#include "plasma/protocol.h"
-#include "plasma/test_util.h"
+#include "ray/object_manager/plasma/client.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/protocol.h"
+#include "ray/object_manager/plasma/test_util.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/test/external_store_tests.cc b/src/ray/object_manager/plasma/test/external_store_tests.cc
similarity index 94%
rename from src/ray/plasma/test/external_store_tests.cc
rename to src/ray/object_manager/plasma/test/external_store_tests.cc
index 804e9cdc8..2f7a0eacf 100644
--- a/src/ray/plasma/test/external_store_tests.cc
+++ b/src/ray/object_manager/plasma/test/external_store_tests.cc
@@ -30,12 +30,12 @@
 #include "arrow/testing/gtest_util.h"
 #include "arrow/util/io_util.h"
 
-#include "plasma/client.h"
-#include "plasma/common.h"
-#include "plasma/external_store.h"
-#include "plasma/plasma.h"
-#include "plasma/protocol.h"
-#include "plasma/test_util.h"
+#include "ray/object_manager/plasma/client.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/external_store.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/protocol.h"
+#include "ray/object_manager/plasma/test_util.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/test/serialization_tests.cc b/src/ray/object_manager/plasma/test/serialization_tests.cc
similarity index 98%
rename from src/ray/plasma/test/serialization_tests.cc
rename to src/ray/object_manager/plasma/test/serialization_tests.cc
index a9eea7be7..d1fcf0a3e 100644
--- a/src/ray/plasma/test/serialization_tests.cc
+++ b/src/ray/object_manager/plasma/test/serialization_tests.cc
@@ -25,11 +25,11 @@
 #include "arrow/testing/gtest_util.h"
 #include "arrow/util/io_util.h"
 
-#include "plasma/common.h"
-#include "plasma/io.h"
-#include "plasma/plasma.h"
-#include "plasma/protocol.h"
-#include "plasma/test_util.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/io.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/protocol.h"
+#include "ray/object_manager/plasma/test_util.h"
 
 namespace fb = plasma::flatbuf;
 
diff --git a/src/ray/plasma/test_util.h b/src/ray/object_manager/plasma/test_util.h
similarity index 97%
rename from src/ray/plasma/test_util.h
rename to src/ray/object_manager/plasma/test_util.h
index 3173d9478..bc81cb1cf 100644
--- a/src/ray/plasma/test_util.h
+++ b/src/ray/object_manager/plasma/test_util.h
@@ -22,7 +22,7 @@
 #include <limits>
 #include <random>
 
-#include "plasma/common.h"
+#include "ray/object_manager/plasma/common.h"
 
 namespace plasma {
 
diff --git a/src/ray/plasma/store_exec.cc b/src/ray/plasma/store_exec.cc
index d4a876186..3e0c8d4e7 100644
--- a/src/ray/plasma/store_exec.cc
+++ b/src/ray/plasma/store_exec.cc
@@ -1,8 +1,14 @@
-#include "plasma/store.h"
 #include <getopt.h>
 #include <stdio.h>
 
-int main(int argc, char* argv[]) {
+#include "ray/object_manager/plasma/store.h"
+// TODO(pcm): Convert getopt and sscanf in the store to use more idiomatic C++
+// and get rid of the next three lines:
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+
+int main(int argc, char *argv[]) {
   std::string socket_name;
   // Directory where plasma memory mapped files are stored.
   std::string plasma_directory;
@@ -35,8 +41,8 @@ int main(int argc, char* argv[]) {
     }
   }
 
-  plasma::PlasmaStoreRunner runner(
-    socket_name, system_memory, hugepages_enabled, plasma_directory, external_store_endpoint);
+  plasma::PlasmaStoreRunner runner(socket_name, system_memory, hugepages_enabled,
+                                   plasma_directory, external_store_endpoint);
   runner.Start();
   return 0;
 }
diff --git a/src/ray/thirdparty/.clang-format b/src/ray/thirdparty/.clang-format
new file mode 100644
index 000000000..37f3d5766
--- /dev/null
+++ b/src/ray/thirdparty/.clang-format
@@ -0,0 +1 @@
+DisableFormat: true
\ No newline at end of file
diff --git a/src/ray/plasma/thirdparty/ae/ae.c b/src/ray/thirdparty/ae/ae.c
similarity index 97%
rename from src/ray/plasma/thirdparty/ae/ae.c
rename to src/ray/thirdparty/ae/ae.c
index dfb722444..883b2b0c6 100644
--- a/src/ray/plasma/thirdparty/ae/ae.c
+++ b/src/ray/thirdparty/ae/ae.c
@@ -40,22 +40,22 @@
 #include <time.h>
 #include <errno.h>
 
-#include "plasma/thirdparty/ae/ae.h"
-#include "plasma/thirdparty/ae/zmalloc.h"
-#include "plasma/thirdparty/ae/config.h"
+#include "ray/thirdparty/ae/ae.h"
+#include "ray/thirdparty/ae/zmalloc.h"
+#include "ray/thirdparty/ae/config.h"
 
 /* Include the best multiplexing layer supported by this system.
  * The following should be ordered by performances, descending. */
 #ifdef HAVE_EVPORT
-#include "plasma/thirdparty/ae/ae_evport.c"
+#include "ray/thirdparty/ae/ae_evport.c"
 #else
     #ifdef HAVE_EPOLL
-    #include "plasma/thirdparty/ae/ae_epoll.c"
+    #include "ray/thirdparty/ae/ae_epoll.c"
     #else
         #ifdef HAVE_KQUEUE
-        #include "plasma/thirdparty/ae/ae_kqueue.c"
+        #include "ray/thirdparty/ae/ae_kqueue.c"
         #else
-        #include "plasma/thirdparty/ae/ae_select.c"
+        #include "ray/thirdparty/ae/ae_select.c"
         #endif
     #endif
 #endif
diff --git a/src/ray/plasma/thirdparty/ae/ae.h b/src/ray/thirdparty/ae/ae.h
similarity index 100%
rename from src/ray/plasma/thirdparty/ae/ae.h
rename to src/ray/thirdparty/ae/ae.h
diff --git a/src/ray/plasma/thirdparty/ae/ae_epoll.c b/src/ray/thirdparty/ae/ae_epoll.c
similarity index 100%
rename from src/ray/plasma/thirdparty/ae/ae_epoll.c
rename to src/ray/thirdparty/ae/ae_epoll.c
diff --git a/src/ray/plasma/thirdparty/ae/ae_evport.c b/src/ray/thirdparty/ae/ae_evport.c
similarity index 100%
rename from src/ray/plasma/thirdparty/ae/ae_evport.c
rename to src/ray/thirdparty/ae/ae_evport.c
diff --git a/src/ray/plasma/thirdparty/ae/ae_kqueue.c b/src/ray/thirdparty/ae/ae_kqueue.c
similarity index 100%
rename from src/ray/plasma/thirdparty/ae/ae_kqueue.c
rename to src/ray/thirdparty/ae/ae_kqueue.c
diff --git a/src/ray/plasma/thirdparty/ae/ae_select.c b/src/ray/thirdparty/ae/ae_select.c
similarity index 100%
rename from src/ray/plasma/thirdparty/ae/ae_select.c
rename to src/ray/thirdparty/ae/ae_select.c
diff --git a/src/ray/plasma/thirdparty/ae/config.h b/src/ray/thirdparty/ae/config.h
similarity index 100%
rename from src/ray/plasma/thirdparty/ae/config.h
rename to src/ray/thirdparty/ae/config.h
diff --git a/src/ray/plasma/thirdparty/ae/zmalloc.h b/src/ray/thirdparty/ae/zmalloc.h
similarity index 100%
rename from src/ray/plasma/thirdparty/ae/zmalloc.h
rename to src/ray/thirdparty/ae/zmalloc.h
diff --git a/src/ray/plasma/thirdparty/dlmalloc.c b/src/ray/thirdparty/dlmalloc.c
similarity index 100%
rename from src/ray/plasma/thirdparty/dlmalloc.c
rename to src/ray/thirdparty/dlmalloc.c