diff --git a/setup.cfg b/setup.cfg
index 91ab907..8e0e31d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,7 +28,7 @@ console_scripts =
     watcher = watcherclient.shell:main
 
 openstack.cli.extension =
-    infra_optim = watcherclient.plugin
+    infra_optim = watcherclient.osc.plugin
 
 # Entry points for the 'openstack' command
 openstack.infra_optim.v1 =
diff --git a/watcherclient/osc/__init__.py b/watcherclient/osc/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/watcherclient/plugin.py b/watcherclient/osc/plugin.py
similarity index 100%
rename from watcherclient/plugin.py
rename to watcherclient/osc/plugin.py