diff --git a/Cinder/module/Jit b/Cinder/module/Jit
deleted file mode 120000
index 33bf53f2d38..00000000000
--- a/Cinder/module/Jit
+++ /dev/null
@@ -1 +0,0 @@
-../../Jit/
\ No newline at end of file
diff --git a/Cinder/module/StaticPython b/Cinder/module/StaticPython
deleted file mode 120000
index 99a8368fb3e..00000000000
--- a/Cinder/module/StaticPython
+++ /dev/null
@@ -1 +0,0 @@
-../../StaticPython
\ No newline at end of file
diff --git a/Cinder/module/StrictModules b/Cinder/module/StrictModules
deleted file mode 120000
index b15f45e7113..00000000000
--- a/Cinder/module/StrictModules
+++ /dev/null
@@ -1 +0,0 @@
-../../StrictModules/
\ No newline at end of file
diff --git a/Cinder/module/ThirdParty b/Cinder/module/ThirdParty
deleted file mode 120000
index b794d21a741..00000000000
--- a/Cinder/module/ThirdParty
+++ /dev/null
@@ -1 +0,0 @@
-../../ThirdParty/
\ No newline at end of file
diff --git a/CinderX/Jit b/CinderX/Jit
new file mode 120000
index 00000000000..ee5df95ac41
--- /dev/null
+++ b/CinderX/Jit
@@ -0,0 +1 @@
+../Jit
\ No newline at end of file
diff --git a/Cinder/module/LICENSE b/CinderX/LICENSE
similarity index 100%
rename from Cinder/module/LICENSE
rename to CinderX/LICENSE
diff --git a/Cinder/module/README.md b/CinderX/README.md
similarity index 100%
rename from Cinder/module/README.md
rename to CinderX/README.md
diff --git a/CinderX/StaticPython b/CinderX/StaticPython
new file mode 120000
index 00000000000..03d8ffc0e81
--- /dev/null
+++ b/CinderX/StaticPython
@@ -0,0 +1 @@
+../StaticPython
\ No newline at end of file
diff --git a/CinderX/StrictModules b/CinderX/StrictModules
new file mode 120000
index 00000000000..b469dd1eb3a
--- /dev/null
+++ b/CinderX/StrictModules
@@ -0,0 +1 @@
+../StrictModules
\ No newline at end of file
diff --git a/CinderX/ThirdParty b/CinderX/ThirdParty
new file mode 120000
index 00000000000..f254dc747cb
--- /dev/null
+++ b/CinderX/ThirdParty
@@ -0,0 +1 @@
+../ThirdParty
\ No newline at end of file
diff --git a/Cinder/module/bootstrap.sh b/CinderX/bootstrap.sh
similarity index 100%
rename from Cinder/module/bootstrap.sh
rename to CinderX/bootstrap.sh
diff --git a/Cinder/module/build.sh b/CinderX/build.sh
similarity index 100%
rename from Cinder/module/build.sh
rename to CinderX/build.sh
diff --git a/Cinder/module/cinder.cpp b/CinderX/cinderx.cpp
similarity index 100%
rename from Cinder/module/cinder.cpp
rename to CinderX/cinderx.cpp
diff --git a/Cinder/module/known-core-python-exported-symbols b/CinderX/known-core-python-exported-symbols
similarity index 100%
rename from Cinder/module/known-core-python-exported-symbols
rename to CinderX/known-core-python-exported-symbols
diff --git a/Cinder/module/make-current-symbols.sh b/CinderX/make-current-symbols.sh
similarity index 100%
rename from Cinder/module/make-current-symbols.sh
rename to CinderX/make-current-symbols.sh
diff --git a/Cinder/module/pip.pyz b/CinderX/pip.pyz
similarity index 100%
rename from Cinder/module/pip.pyz
rename to CinderX/pip.pyz
diff --git a/Cinder/module/pyproject.toml b/CinderX/pyproject.toml
similarity index 100%
rename from Cinder/module/pyproject.toml
rename to CinderX/pyproject.toml
diff --git a/Cinder/module/setup.py b/CinderX/setup.py
similarity index 98%
rename from Cinder/module/setup.py
rename to CinderX/setup.py
index 78daae99529..f233c88f3d7 100644
--- a/Cinder/module/setup.py
+++ b/CinderX/setup.py
@@ -14,8 +14,8 @@
 MODULE_DIR = os.path.dirname(os.path.realpath(__file__))
 
 THIRD_PARTY_DIR = os.path.realpath(f"{MODULE_DIR}/ThirdParty")
-CINDER_DIR = os.path.realpath(f"{MODULE_DIR}/..")
-PYTHON_DIR = os.path.realpath(f"{MODULE_DIR}/../../")
+PYTHON_DIR = os.path.realpath(f"{MODULE_DIR}/..")
+CINDER_DIR = os.path.realpath(f"{PYTHON_DIR}/Cinder/")
 
 INCLUDE_DIRS = [
     f"{CINDER_DIR}/Include",
diff --git a/Cinder/module/setuptools-65.6.0-py3-none-any.whl b/CinderX/setuptools-65.6.0-py3-none-any.whl
similarity index 100%
rename from Cinder/module/setuptools-65.6.0-py3-none-any.whl
rename to CinderX/setuptools-65.6.0-py3-none-any.whl
diff --git a/Makefile.pre.in b/Makefile.pre.in
index bce81a7a9aa..9bd99fbc60f 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -328,7 +328,7 @@ ASAN_TEST_ENV_WITH_LSAN= @ASAN_TEST_ENV_WITH_LSAN@
 
 ENABLE_CINDERX_SO=@ENABLE_CINDERX_SO@
 ifeq ($(ENABLE_CINDERX_SO), yes)
-	CINDERX_SO=$(abs_srcdir)/Cinder/module/build/cinderx.$(SOABI).so
+	CINDERX_SO=$(abs_srcdir)/CinderX/build/cinderx.$(SOABI).so
 else
 	CINDERX_SO=
 endif
@@ -836,7 +836,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
 
 .PHONY: $(CINDERX_SO)
 $(CINDERX_SO):
-	$(abs_srcdir)/Cinder/module/build.sh
+	$(abs_srcdir)/CinderX/build.sh
 
 # Build the interpreter
 $(BUILDPYTHON):	Programs/python.o $(LIBRARY_DEPS) $(CINDERX_SO)