diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e88ad2d73..cd567c9976 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,6 @@ set_property(
 add_subdirectory(eden/cli)
 add_subdirectory(eden/fs)
 add_subdirectory(eden/integration)
-add_subdirectory(eden/py)
 add_subdirectory(eden/scm/edenscm/hgext/extlib)
 add_subdirectory(eden/scm/edenscm/mercurial)
 add_subdirectory(eden/scm/lib)
diff --git a/eden/fs/CMakeLists.txt b/eden/fs/CMakeLists.txt
index 9feba6ce98..0c0088ec24 100644
--- a/eden/fs/CMakeLists.txt
+++ b/eden/fs/CMakeLists.txt
@@ -42,6 +42,7 @@ add_subdirectory(store)
 add_subdirectory(telemetry)
 add_subdirectory(utils)
 add_subdirectory(testharness)
+add_subdirectory(py)
 
 
 # Platform specific code
diff --git a/eden/py/CMakeLists.txt b/eden/fs/py/CMakeLists.txt
similarity index 100%
rename from eden/py/CMakeLists.txt
rename to eden/fs/py/CMakeLists.txt
diff --git a/eden/py/eden/__init__.py b/eden/fs/py/eden/__init__.py
similarity index 100%
rename from eden/py/eden/__init__.py
rename to eden/fs/py/eden/__init__.py
diff --git a/eden/py/eden/dirstate.py b/eden/fs/py/eden/dirstate.py
similarity index 100%
rename from eden/py/eden/dirstate.py
rename to eden/fs/py/eden/dirstate.py
diff --git a/eden/py/eden/thrift/__init__.py b/eden/fs/py/eden/thrift/__init__.py
similarity index 100%
rename from eden/py/eden/thrift/__init__.py
rename to eden/fs/py/eden/thrift/__init__.py
diff --git a/eden/py/eden/thrift/client.py b/eden/fs/py/eden/thrift/client.py
similarity index 100%
rename from eden/py/eden/thrift/client.py
rename to eden/fs/py/eden/thrift/client.py
diff --git a/eden/py/eden/thrift/windows_thrift.py b/eden/fs/py/eden/thrift/windows_thrift.py
similarity index 100%
rename from eden/py/eden/thrift/windows_thrift.py
rename to eden/fs/py/eden/thrift/windows_thrift.py
diff --git a/eden/py/test/dirstate_test.py b/eden/fs/py/test/dirstate_test.py
similarity index 100%
rename from eden/py/test/dirstate_test.py
rename to eden/fs/py/test/dirstate_test.py
diff --git a/eden/scm/setup.py b/eden/scm/setup.py
index 5aa6dcf691..54342ac5fa 100644
--- a/eden/scm/setup.py
+++ b/eden/scm/setup.py
@@ -803,7 +803,7 @@ class fetchbuilddeps(Command):
                 "thrift/util/tests/__init__.py",
             ],
         ),
-        fbsourcepylibrary("eden", "../../eden/py/eden"),
+        fbsourcepylibrary("eden", "../../eden/fs/py/eden"),
     ]
     pyassets += [
         edenpythrift(name="eden-rust-deps-e0fd3d6d06542b491712b6e7fdedfae9b6e7ad15.zip")
diff --git a/eden/scm/setup3.py b/eden/scm/setup3.py
index 4eab320c7c..82dd04b3ba 100644
--- a/eden/scm/setup3.py
+++ b/eden/scm/setup3.py
@@ -704,7 +704,7 @@ class fetchbuilddeps(Command):
                 "thrift/util/tests/__init__.py",
             ],
         ),
-        fbsourcepylibrary("eden", "../../eden/py/eden"),
+        fbsourcepylibrary("eden", "../../eden/fs/py/eden"),
         edenpythrift(
             name="eden-rust-deps-e0fd3d6d06542b491712b6e7fdedfae9b6e7ad15.zip"
         ),
diff --git a/make-client.py b/make-client.py
index b3bdbc0dee..8869c58cf0 100755
--- a/make-client.py
+++ b/make-client.py
@@ -31,7 +31,7 @@ DEPS = ["future", "six", "toml"]
 # python sources are found, and the rhs is the destination path
 MODULES = [
     # Eden python libraries
-    ("eden/py/eden", "eden"),
+    ("eden/fs/py/eden", "eden"),
     # The cli
     ("eden/cli", "eden/cli"),
 ]