diff --git a/opentelemetry-api/setup.py b/opentelemetry-api/setup.py
index 0b9efda34a6..725b0818fff 100644
--- a/opentelemetry-api/setup.py
+++ b/opentelemetry-api/setup.py
@@ -42,7 +42,8 @@
     ],
     entry_points={
         "console_scripts": [
-            "auto_agent = opentelemetry.commands.auto_agent:run"
+            "opentelemetry-auto-instrument = "
+            "opentelemetry.auto_instrument.auto_instrument:run"
         ],
         "opentelemetry_patcher": [
             "no_op_patcher = opentelemetry.patcher.no_op_patcher:NoOpPatcher"
diff --git a/opentelemetry-api/src/opentelemetry/commands/__init__.py b/opentelemetry-api/src/opentelemetry/auto_instrument/__init__.py
similarity index 100%
rename from opentelemetry-api/src/opentelemetry/commands/__init__.py
rename to opentelemetry-api/src/opentelemetry/auto_instrument/__init__.py
diff --git a/opentelemetry-api/src/opentelemetry/commands/auto_agent.py b/opentelemetry-api/src/opentelemetry/auto_instrument/auto_instrument.py
similarity index 90%
rename from opentelemetry-api/src/opentelemetry/commands/auto_agent.py
rename to opentelemetry-api/src/opentelemetry/auto_instrument/auto_instrument.py
index df5011e1f4d..9926e73dc2f 100755
--- a/opentelemetry-api/src/opentelemetry/commands/auto_agent.py
+++ b/opentelemetry-api/src/opentelemetry/auto_instrument/auto_instrument.py
@@ -16,12 +16,12 @@
 
 from distutils.spawn import find_executable
 from os import environ, execl
-from os.path import dirname, join
+from os.path import dirname
 from sys import argv
 
 
 def run() -> None:
-    environ["PYTHONPATH"] = join(dirname(__file__), "initialize")
+    environ["PYTHONPATH"] = dirname(__file__)
     python3 = find_executable(argv[1])
     execl(python3, python3, *argv[2:])  # type: ignore
     exit(0)  # pylint: disable=consider-using-sys-exit
diff --git a/opentelemetry-api/src/opentelemetry/commands/initialize/sitecustomize.py b/opentelemetry-api/src/opentelemetry/auto_instrument/sitecustomize.py
similarity index 100%
rename from opentelemetry-api/src/opentelemetry/commands/initialize/sitecustomize.py
rename to opentelemetry-api/src/opentelemetry/auto_instrument/sitecustomize.py
diff --git a/opentelemetry-api/src/opentelemetry/commands/initialize/__init__.py b/opentelemetry-api/src/opentelemetry/commands/initialize/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000