diff --git a/README.rst b/README.rst
index db4e276..fa63841 100644
--- a/README.rst
+++ b/README.rst
@@ -62,10 +62,10 @@ With Horizon
 
     ../horizon/tools/with_venv.sh pip install -e.
 
-    cp -a vitragedashboard/enabled/* ../horizon/openstack_dashboard/enabled/
+    cp -a vitrage_dashboard/enabled/* ../horizon/openstack_dashboard/enabled/
 
     popd
 
     cd python-vitrageclient
 
-    ../horizon/tools/with_venv.sh pip install -e.
\ No newline at end of file
+    ../horizon/tools/with_venv.sh pip install -e.
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a6f34b0..5bb8391 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -8,7 +8,7 @@ function install_vitrage_dashboard {
 }
 
 function configure_vitrage_dashboard {
-    cp -a ${VITRAGE_DASHBOARD_DIR}/enabled/* ${DEST}/horizon/openstack_dashboard/enabled/
+    cp -a ${VITRAGE_DASHBOARD_DIR}/vitrage_dashboard/enabled/* ${DEST}/horizon/openstack_dashboard/enabled/
 }
 
 function init_vitrage_dashboard {
diff --git a/enabled/_4000_project_vitrage_panel_group.py b/vitrage_dashboard/enabled/_4000_project_vitrage_panel_group.py
similarity index 100%
rename from enabled/_4000_project_vitrage_panel_group.py
rename to vitrage_dashboard/enabled/_4000_project_vitrage_panel_group.py
diff --git a/enabled/_4010_project_topology_vitrage_panel.py b/vitrage_dashboard/enabled/_4010_project_topology_vitrage_panel.py
similarity index 100%
rename from enabled/_4010_project_topology_vitrage_panel.py
rename to vitrage_dashboard/enabled/_4010_project_topology_vitrage_panel.py
diff --git a/enabled/_4020_project_alarms_vitrage_panel.py b/vitrage_dashboard/enabled/_4020_project_alarms_vitrage_panel.py
similarity index 100%
rename from enabled/_4020_project_alarms_vitrage_panel.py
rename to vitrage_dashboard/enabled/_4020_project_alarms_vitrage_panel.py
diff --git a/enabled/_4030_project_entities_vitrage_panel.py b/vitrage_dashboard/enabled/_4030_project_entities_vitrage_panel.py
similarity index 100%
rename from enabled/_4030_project_entities_vitrage_panel.py
rename to vitrage_dashboard/enabled/_4030_project_entities_vitrage_panel.py
diff --git a/enabled/_4040_project_template_vitrage_panel.py b/vitrage_dashboard/enabled/_4040_project_template_vitrage_panel.py
similarity index 100%
rename from enabled/_4040_project_template_vitrage_panel.py
rename to vitrage_dashboard/enabled/_4040_project_template_vitrage_panel.py
diff --git a/enabled/_4100_admin_vitrage_panel_group.py b/vitrage_dashboard/enabled/_4100_admin_vitrage_panel_group.py
similarity index 100%
rename from enabled/_4100_admin_vitrage_panel_group.py
rename to vitrage_dashboard/enabled/_4100_admin_vitrage_panel_group.py
diff --git a/enabled/_4110_admin_topology_vitrage_panel.py b/vitrage_dashboard/enabled/_4110_admin_topology_vitrage_panel.py
similarity index 100%
rename from enabled/_4110_admin_topology_vitrage_panel.py
rename to vitrage_dashboard/enabled/_4110_admin_topology_vitrage_panel.py
diff --git a/enabled/_4120_admin_alarms_vitrage_panel.py b/vitrage_dashboard/enabled/_4120_admin_alarms_vitrage_panel.py
similarity index 100%
rename from enabled/_4120_admin_alarms_vitrage_panel.py
rename to vitrage_dashboard/enabled/_4120_admin_alarms_vitrage_panel.py
diff --git a/enabled/_4130_admin_entities_vitrage_panel.py b/vitrage_dashboard/enabled/_4130_admin_entities_vitrage_panel.py
similarity index 100%
rename from enabled/_4130_admin_entities_vitrage_panel.py
rename to vitrage_dashboard/enabled/_4130_admin_entities_vitrage_panel.py