diff --git a/pankoclient/osc/plugin.py b/pankoclient/osc.py
similarity index 100%
rename from pankoclient/osc/plugin.py
rename to pankoclient/osc.py
diff --git a/pankoclient/osc/v2/__init__.py b/pankoclient/osc/v2/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pankoclient/tests/unit/osc/__init__.py b/pankoclient/tests/unit/osc/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pankoclient/tests/unit/osc/v2/__init__.py b/pankoclient/tests/unit/osc/v2/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pankoclient/tests/unit/osc/test_plugin.py b/pankoclient/tests/unit/test_osc_plugin.py
similarity index 98%
rename from pankoclient/tests/unit/osc/test_plugin.py
rename to pankoclient/tests/unit/test_osc_plugin.py
index 193ec4e..9ad75c3 100644
--- a/pankoclient/tests/unit/osc/test_plugin.py
+++ b/pankoclient/tests/unit/test_osc_plugin.py
@@ -17,7 +17,7 @@ import mock
 
 from osc_lib.tests import fakes
 
-from pankoclient.osc import plugin
+from pankoclient import osc as plugin
 from pankoclient.tests.unit import base
 
 
diff --git a/pankoclient/osc/__init__.py b/pankoclient/tests/unit/v2/__init__.py
similarity index 100%
rename from pankoclient/osc/__init__.py
rename to pankoclient/tests/unit/v2/__init__.py
diff --git a/pankoclient/tests/unit/osc/v2/test_events.py b/pankoclient/tests/unit/v2/test_events.py
similarity index 98%
rename from pankoclient/tests/unit/osc/v2/test_events.py
rename to pankoclient/tests/unit/v2/test_events.py
index eeadbf4..5b591d4 100644
--- a/pankoclient/tests/unit/osc/v2/test_events.py
+++ b/pankoclient/tests/unit/v2/test_events.py
@@ -15,9 +15,9 @@
 
 import mock
 
-from pankoclient.osc.v2 import events
 from pankoclient.tests.unit import base as test_base
 from pankoclient.v2 import events as events_mgr
+from pankoclient.v2 import events_cli as events
 
 
 @mock.patch.object(events_mgr.EventTypeManager, '_list')
diff --git a/pankoclient/osc/v2/capabilities.py b/pankoclient/v2/capabilities_cli.py
similarity index 100%
rename from pankoclient/osc/v2/capabilities.py
rename to pankoclient/v2/capabilities_cli.py
diff --git a/pankoclient/osc/v2/events.py b/pankoclient/v2/events_cli.py
similarity index 100%
rename from pankoclient/osc/v2/events.py
rename to pankoclient/v2/events_cli.py
diff --git a/setup.cfg b/setup.cfg
index a825598..659bd4c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -43,15 +43,15 @@ doc =
 
 [entry_points]
 openstack.cli.extension =
-    event = pankoclient.osc.plugin
+    event = pankoclient.osc
 
 openstack.event.v2 =
-    event capabilities list = pankoclient.osc.v2.capabilities:CliCapabilitiesList
-    event list = pankoclient.osc.v2.events:EventList
-    event show = pankoclient.osc.v2.events:EventShow
-    event type list = pankoclient.osc.v2.events:EventTypeList
-    event trait list = pankoclient.osc.v2.events:EventTraitList
-    event trait description = pankoclient.osc.v2.events:EventTraitDescription
+    event capabilities list = pankoclient.v2.capabilities_cli:CliCapabilitiesList
+    event list = pankoclient.v2.events_cli:EventList
+    event show = pankoclient.v2.events_cli:EventShow
+    event type list = pankoclient.v2.events_cli:EventTypeList
+    event trait list = pankoclient.v2.events_cli:EventTraitList
+    event trait description = pankoclient.v2.events_cli:EventTraitDescription
 
 [build_sphinx]
 source-dir = doc/source