diff --git a/roar_py_carla/requirements.txt b/roar_py_carla/requirements.txt
deleted file mode 100644
index b0e5067..0000000
--- a/roar_py_carla/requirements.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-roar_py_core
-asyncio
-numpy
-carla>=0.9.12
-networkx==3.1
-transforms3d==0.4.1
-pytest>=7.3.1
-pytest-asyncio>=0.21.0
\ No newline at end of file
diff --git a/roar_py_carla/setup.py b/roar_py_carla/setup.py
index 8f629cf..00177e7 100644
--- a/roar_py_carla/setup.py
+++ b/roar_py_carla/setup.py
@@ -10,7 +10,7 @@ def read_requirements_file(filename):
 
 setup(
     name='roar_py_carla',
-     version='0.1.0',
+    version='0.1.0',
     description="ROAR_PY carla implementation",
     url="https://github.com/augcog/ROAR_PY",
     classifiers=[
@@ -24,7 +24,19 @@ def read_requirements_file(filename):
     author="Yunhao Cao",
     keywords=["reinforcement learning", "gymnasium", "robotics", "carla", "carla-simulator"],
     license="MIT",
-    install_requires=read_requirements_file("requirements.txt"),
-    packages=['roar_py_carla'], # find_packages(),
+    install_requires=[
+        "roar_py_core==0.1.0",
+        "asyncio",
+        "numpy",
+        "carla>=0.9.12",
+        "networkx>=3.1",
+        "transforms3d>=0.4.1"
+    ],
+    tests_require=[
+        "pytest>=7.3.1",
+        "pytest-asyncio>=0.21.0"
+    ],
+    packages=find_packages(),
+    include_package_data=True,
     python_requires='>=3.8',
 )
\ No newline at end of file
diff --git a/roar_py_core/requirements.txt b/roar_py_core/requirements.txt
deleted file mode 100644
index a167b2e..0000000
--- a/roar_py_core/requirements.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-gymnasium==0.28.1
-numpy
-asyncio
-pyserde[all]==0.10.4
-Pillow==9.5.0
-transforms3d==0.4.1
-pytest>=7.3.1
-pytest-asyncio>=0.21.0
-networkx==3.1
-matplotlib
-websockets>=11.0.1
-pygame >= 2.4
-typing_inspect>=0.8.0
-numba>=0.55.0
\ No newline at end of file
diff --git a/roar_py_core/setup.py b/roar_py_core/setup.py
index b95bb4a..58828a0 100644
--- a/roar_py_core/setup.py
+++ b/roar_py_core/setup.py
@@ -24,7 +24,21 @@ def read_requirements_file(filename):
     author="Yunhao Cao",
     keywords=["reinforcement learning", "gymnasium", "robotics", "rpc"],
     license="MIT",
-    install_requires=read_requirements_file("requirements.txt"),
-    packages=['roar_py_interface', 'roar_py_remote'], # find_packages(),
+    install_requires=[
+        "gymnasium>=0.28.1",
+        "numpy",
+        "asyncio",
+        "pyserde[all]>=0.10.4",
+        "Pillow>=9.5.0",
+        "transforms3d>=0.4.1",
+        "websockets>=11.0.1",
+        "numba>=0.55.0"
+    ],
+    tests_require=[
+        "pytest>=7.3.1",
+        "pytest-asyncio>=0.21.0"
+    ],
+    packages=find_packages(),
+    include_package_data=True,
     python_requires='>=3.8',
 )
\ No newline at end of file