diff --git a/README.md b/README.md
index fbda213d..ecd2c438 100644
--- a/README.md
+++ b/README.md
@@ -4,14 +4,14 @@ monasca-ui
 Monasca UI is implemented as a horizon plugin that adds panels to horizon. It is installed into devstack
 by monasca-vagrant. For a UI development setup:
 * git clone https://github.com/openstack/horizon.git  # clone horizon
-* git clone https://github.com/stackforge/monasca-ui.git # clone monasca-ui
 * git clone https://github.com/hpcloud-mon/grafana.git
+* ln -s grafana/src horizon/static/grafana
+
 * cd horizon
-* cp ../monasca-ui/enabled/* openstack_dashbaord/local/enabled  # Copy enabled files
-* ln -s ../monasca-ui/monitoring monitoring
-* ln -s ../../../grafana/src monitoring/static/grafana
-* tools/with_venv.sh pip install -r ../monasca-ui/requirements.txt
-* cat ../monasca-ui/local_settings.py >> openstack_dashboard/local/local_settings.py
+* Add git+https://github.com/stackforge/monasca-ui.git  to requirements.txt
+* Edit openstack_dashboard/settings.py to include the following two lines:
+* import monitoring.enabled
+* monitoring.enabled, #Add to the settings.update_dashboards list
 # 
 License
 
diff --git a/monitoring/config/__init__.py b/monitoring/config/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/config/local_settings.py b/monitoring/config/local_settings.py
similarity index 75%
rename from config/local_settings.py
rename to monitoring/config/local_settings.py
index 1cc467c6..3e792fbd 100644
--- a/config/local_settings.py
+++ b/monitoring/config/local_settings.py
@@ -1,3 +1,4 @@
+from django.utils.translation import ugettext_lazy as _
 
 # Services being monitored
 MONITORING_SERVICES = [
diff --git a/enabled/_50_admin_add_monitoring_panel.py b/monitoring/enabled/_50_admin_add_monitoring_panel.py
similarity index 100%
rename from enabled/_50_admin_add_monitoring_panel.py
rename to monitoring/enabled/_50_admin_add_monitoring_panel.py
diff --git a/monitoring/enabled/__init__.py b/monitoring/enabled/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/setup.cfg b/setup.cfg
index ab62ea58..fa5e3e99 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,11 +22,6 @@ classifier =
 packages = 
     monitoring
 
-data_files=
-    share/monasca/ui =
-        config/local_settings.py
-    share/monasca/ui/enabled = enabled/*
-
 [pbr]
 autodoc_index_modules = True