diff --git a/MANIFEST.in b/MANIFEST.in
index 34f1ff1..79f2b1c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -17,11 +17,11 @@
 # under the License.
 
 # For those usages not covered by the Apache License, Version 2.0 please
-# contact: prithiv.mohan@intel.com or adrian.hoban@intel.com
+# contact: prithiv.mohan@intel.com or adrian.hoban@intel.com.
 
 include requirements.txt
 include README.rst
 include kafkad
-recursive-include osm-mon *
+recursive-include osm_mon *
 recursive-include devops-stages *
 recursive-include test *
diff --git a/Makefile b/Makefile
index 08d03f9..f789f38 100644
--- a/Makefile
+++ b/Makefile
@@ -43,23 +43,23 @@
 	cp README.rst build/
 	cp setup.py build/
 	cp kafkad build/
-	cp -r osm-mon build/
+	cp -r osm_mon build/
 	cp -r devops-stages build/
 	cp -r scripts build/
 	#pip install -r requirements.txt
 	#pip install -r test-requirements.txt
 
 build: clean openstack_plugins prepare
-	python -m py_compile build/osm-mon/plugins/OpenStack/*.py
+	python -m py_compile build/osm_mon/plugins/OpenStack/*.py
 
 build: clean vrops_plugins prepare
-	python -m py_compile build/osm-mon/plugins/vRealiseOps/*.py
+	python -m py_compile build/osm_mon/plugins/vRealiseOps/*.py
 
 build: clean cloudwatch_plugins prepare
-	python -m py_compile build/osm-mon/plugins/CloudWatch/*.py
+	python -m py_compile build/osm_mon/plugins/CloudWatch/*.py
 
 build: clean core prepare
-	python -m py_compile build/osm-mon/core/message_bus/*.py
+	python -m py_compile build/osm_mon/core/message_bus/*.py
 
 pip: prepare
 	cd build ./setup.py sdist
diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
index bbe2b8a..e78acc0 100755
--- a/devops-stages/stage-build.sh
+++ b/devops-stages/stage-build.sh
@@ -23,4 +23,5 @@
 #__date__   = "14/Sep/2017"
 
 #!/bin/bash
+make clean all BRANCH=master
 make package
diff --git a/osm-mon/core/__init__.py b/osm_mon/core/__init__.py
similarity index 100%
rename from osm-mon/core/__init__.py
rename to osm_mon/core/__init__.py
diff --git a/osm-mon/core/message_bus/__init__.py b/osm_mon/core/message_bus/__init__.py
similarity index 100%
rename from osm-mon/core/message_bus/__init__.py
rename to osm_mon/core/message_bus/__init__.py
diff --git a/osm-mon/core/message_bus/common_consumer b/osm_mon/core/message_bus/common_consumer
similarity index 100%
rename from osm-mon/core/message_bus/common_consumer
rename to osm_mon/core/message_bus/common_consumer
diff --git a/osm-mon/core/message_bus/consumer.py b/osm_mon/core/message_bus/consumer.py
similarity index 100%
rename from osm-mon/core/message_bus/consumer.py
rename to osm_mon/core/message_bus/consumer.py
diff --git a/osm-mon/core/message_bus/producer.py b/osm_mon/core/message_bus/producer.py
similarity index 99%
rename from osm-mon/core/message_bus/producer.py
rename to osm_mon/core/message_bus/producer.py
index 4aee831..a72410a 100755
--- a/osm-mon/core/message_bus/producer.py
+++ b/osm_mon/core/message_bus/producer.py
@@ -36,8 +36,7 @@
 __author__ = "Prithiv Mohan"
 __date__ = "06/Sep/2017"
 
-json_path = os.path.join(os.pardir+"/models/")
-
+json_path=os.path.abspath(os.pardir+"/MON/osm_mon/core/models/")
 
 class KafkaProducer(object):
 
diff --git a/osm-mon/core/models/.gitkeep b/osm_mon/core/models/.gitkeep
similarity index 100%
rename from osm-mon/core/models/.gitkeep
rename to osm_mon/core/models/.gitkeep
diff --git a/osm-mon/core/models/access_cred_CloudWatch.json b/osm_mon/core/models/access_cred_CloudWatch.json
similarity index 100%
rename from osm-mon/core/models/access_cred_CloudWatch.json
rename to osm_mon/core/models/access_cred_CloudWatch.json
diff --git a/osm-mon/core/models/access_cred_OpenStack.json b/osm_mon/core/models/access_cred_OpenStack.json
similarity index 100%
rename from osm-mon/core/models/access_cred_OpenStack.json
rename to osm_mon/core/models/access_cred_OpenStack.json
diff --git a/osm-mon/core/models/access_cred_vROPs.json b/osm_mon/core/models/access_cred_vROPs.json
similarity index 100%
rename from osm-mon/core/models/access_cred_vROPs.json
rename to osm_mon/core/models/access_cred_vROPs.json
diff --git a/osm-mon/core/models/acknowledge_alarm.json b/osm_mon/core/models/acknowledge_alarm.json
similarity index 100%
rename from osm-mon/core/models/acknowledge_alarm.json
rename to osm_mon/core/models/acknowledge_alarm.json
diff --git a/osm-mon/core/models/create_alarm.json b/osm_mon/core/models/create_alarm.json
similarity index 100%
rename from osm-mon/core/models/create_alarm.json
rename to osm_mon/core/models/create_alarm.json
diff --git a/osm-mon/core/models/create_alarm_resp.json b/osm_mon/core/models/create_alarm_resp.json
similarity index 100%
rename from osm-mon/core/models/create_alarm_resp.json
rename to osm_mon/core/models/create_alarm_resp.json
diff --git a/osm-mon/core/models/create_metric_req.json b/osm_mon/core/models/create_metric_req.json
similarity index 100%
rename from osm-mon/core/models/create_metric_req.json
rename to osm_mon/core/models/create_metric_req.json
diff --git a/osm-mon/core/models/create_metric_resp.json b/osm_mon/core/models/create_metric_resp.json
similarity index 100%
rename from osm-mon/core/models/create_metric_resp.json
rename to osm_mon/core/models/create_metric_resp.json
diff --git a/osm-mon/core/models/delete_alarm_req.json b/osm_mon/core/models/delete_alarm_req.json
similarity index 100%
rename from osm-mon/core/models/delete_alarm_req.json
rename to osm_mon/core/models/delete_alarm_req.json
diff --git a/osm-mon/core/models/delete_alarm_resp.json b/osm_mon/core/models/delete_alarm_resp.json
similarity index 100%
rename from osm-mon/core/models/delete_alarm_resp.json
rename to osm_mon/core/models/delete_alarm_resp.json
diff --git a/osm-mon/core/models/delete_metric_req.json b/osm_mon/core/models/delete_metric_req.json
similarity index 100%
rename from osm-mon/core/models/delete_metric_req.json
rename to osm_mon/core/models/delete_metric_req.json
diff --git a/osm-mon/core/models/delete_metric_resp.json b/osm_mon/core/models/delete_metric_resp.json
similarity index 100%
rename from osm-mon/core/models/delete_metric_resp.json
rename to osm_mon/core/models/delete_metric_resp.json
diff --git a/osm-mon/core/models/list_alarm_req.json b/osm_mon/core/models/list_alarm_req.json
similarity index 100%
rename from osm-mon/core/models/list_alarm_req.json
rename to osm_mon/core/models/list_alarm_req.json
diff --git a/osm-mon/core/models/list_alarm_resp.json b/osm_mon/core/models/list_alarm_resp.json
similarity index 100%
rename from osm-mon/core/models/list_alarm_resp.json
rename to osm_mon/core/models/list_alarm_resp.json
diff --git a/osm-mon/core/models/list_metric_req.json b/osm_mon/core/models/list_metric_req.json
similarity index 100%
rename from osm-mon/core/models/list_metric_req.json
rename to osm_mon/core/models/list_metric_req.json
diff --git a/osm-mon/core/models/list_metric_resp.json b/osm_mon/core/models/list_metric_resp.json
similarity index 100%
rename from osm-mon/core/models/list_metric_resp.json
rename to osm_mon/core/models/list_metric_resp.json
diff --git a/osm-mon/core/models/notify_alarm.json b/osm_mon/core/models/notify_alarm.json
similarity index 100%
rename from osm-mon/core/models/notify_alarm.json
rename to osm_mon/core/models/notify_alarm.json
diff --git a/osm-mon/core/models/read_metric_data_req.json b/osm_mon/core/models/read_metric_data_req.json
similarity index 100%
rename from osm-mon/core/models/read_metric_data_req.json
rename to osm_mon/core/models/read_metric_data_req.json
diff --git a/osm-mon/core/models/read_metric_data_resp.json b/osm_mon/core/models/read_metric_data_resp.json
similarity index 100%
rename from osm-mon/core/models/read_metric_data_resp.json
rename to osm_mon/core/models/read_metric_data_resp.json
diff --git a/osm-mon/core/models/update_alarm_req.json b/osm_mon/core/models/update_alarm_req.json
similarity index 100%
rename from osm-mon/core/models/update_alarm_req.json
rename to osm_mon/core/models/update_alarm_req.json
diff --git a/osm-mon/core/models/update_alarm_resp.json b/osm_mon/core/models/update_alarm_resp.json
similarity index 100%
rename from osm-mon/core/models/update_alarm_resp.json
rename to osm_mon/core/models/update_alarm_resp.json
diff --git a/osm-mon/core/models/update_metric_req.json b/osm_mon/core/models/update_metric_req.json
similarity index 100%
rename from osm-mon/core/models/update_metric_req.json
rename to osm_mon/core/models/update_metric_req.json
diff --git a/osm-mon/core/models/update_metric_resp.json b/osm_mon/core/models/update_metric_resp.json
similarity index 100%
rename from osm-mon/core/models/update_metric_resp.json
rename to osm_mon/core/models/update_metric_resp.json
diff --git a/osm-mon/plugins/CloudWatch/.gitkeep b/osm_mon/plugins/CloudWatch/.gitkeep
similarity index 100%
rename from osm-mon/plugins/CloudWatch/.gitkeep
rename to osm_mon/plugins/CloudWatch/.gitkeep
diff --git a/osm-mon/plugins/CloudWatch/connection.py b/osm_mon/plugins/CloudWatch/connection.py
similarity index 100%
rename from osm-mon/plugins/CloudWatch/connection.py
rename to osm_mon/plugins/CloudWatch/connection.py
diff --git a/osm-mon/plugins/CloudWatch/metric_alarms.py b/osm_mon/plugins/CloudWatch/metric_alarms.py
similarity index 100%
rename from osm-mon/plugins/CloudWatch/metric_alarms.py
rename to osm_mon/plugins/CloudWatch/metric_alarms.py
diff --git a/osm-mon/plugins/CloudWatch/metrics.py b/osm_mon/plugins/CloudWatch/metrics.py
similarity index 100%
rename from osm-mon/plugins/CloudWatch/metrics.py
rename to osm_mon/plugins/CloudWatch/metrics.py
diff --git a/osm-mon/plugins/CloudWatch/plugin_alarm.py b/osm_mon/plugins/CloudWatch/plugin_alarm.py
similarity index 100%
rename from osm-mon/plugins/CloudWatch/plugin_alarm.py
rename to osm_mon/plugins/CloudWatch/plugin_alarm.py
diff --git a/osm-mon/plugins/CloudWatch/plugin_metrics.py b/osm_mon/plugins/CloudWatch/plugin_metrics.py
similarity index 100%
rename from osm-mon/plugins/CloudWatch/plugin_metrics.py
rename to osm_mon/plugins/CloudWatch/plugin_metrics.py
diff --git a/osm-mon/plugins/OpenStack/Aodh/__init__.py b/osm_mon/plugins/OpenStack/Aodh/__init__.py
similarity index 100%
rename from osm-mon/plugins/OpenStack/Aodh/__init__.py
rename to osm_mon/plugins/OpenStack/Aodh/__init__.py
diff --git a/osm-mon/plugins/OpenStack/Aodh/alarming.py b/osm_mon/plugins/OpenStack/Aodh/alarming.py
similarity index 100%
rename from osm-mon/plugins/OpenStack/Aodh/alarming.py
rename to osm_mon/plugins/OpenStack/Aodh/alarming.py
diff --git a/osm-mon/plugins/OpenStack/Aodh/notifier.py b/osm_mon/plugins/OpenStack/Aodh/notifier.py
similarity index 100%
rename from osm-mon/plugins/OpenStack/Aodh/notifier.py
rename to osm_mon/plugins/OpenStack/Aodh/notifier.py
diff --git a/osm-mon/plugins/OpenStack/Gnocchi/.gitkeep b/osm_mon/plugins/OpenStack/Gnocchi/.gitkeep
similarity index 100%
rename from osm-mon/plugins/OpenStack/Gnocchi/.gitkeep
rename to osm_mon/plugins/OpenStack/Gnocchi/.gitkeep
diff --git a/osm-mon/plugins/OpenStack/Gnocchi/__init__.py b/osm_mon/plugins/OpenStack/Gnocchi/__init__.py
similarity index 100%
rename from osm-mon/plugins/OpenStack/Gnocchi/__init__.py
rename to osm_mon/plugins/OpenStack/Gnocchi/__init__.py
diff --git a/osm-mon/plugins/OpenStack/Gnocchi/metrics.py b/osm_mon/plugins/OpenStack/Gnocchi/metrics.py
similarity index 100%
rename from osm-mon/plugins/OpenStack/Gnocchi/metrics.py
rename to osm_mon/plugins/OpenStack/Gnocchi/metrics.py
diff --git a/osm-mon/plugins/OpenStack/__init__.py b/osm_mon/plugins/OpenStack/__init__.py
similarity index 100%
rename from osm-mon/plugins/OpenStack/__init__.py
rename to osm_mon/plugins/OpenStack/__init__.py
diff --git a/osm-mon/plugins/OpenStack/common.py b/osm_mon/plugins/OpenStack/common.py
similarity index 100%
rename from osm-mon/plugins/OpenStack/common.py
rename to osm_mon/plugins/OpenStack/common.py
diff --git a/osm-mon/plugins/OpenStack/response.py b/osm_mon/plugins/OpenStack/response.py
similarity index 100%
rename from osm-mon/plugins/OpenStack/response.py
rename to osm_mon/plugins/OpenStack/response.py
diff --git a/osm-mon/plugins/OpenStack/settings.py b/osm_mon/plugins/OpenStack/settings.py
similarity index 100%
rename from osm-mon/plugins/OpenStack/settings.py
rename to osm_mon/plugins/OpenStack/settings.py
diff --git a/osm-mon/plugins/OpenStack/singleton.py b/osm_mon/plugins/OpenStack/singleton.py
similarity index 100%
rename from osm-mon/plugins/OpenStack/singleton.py
rename to osm_mon/plugins/OpenStack/singleton.py
diff --git a/osm-mon/plugins/__init__.py b/osm_mon/plugins/__init__.py
similarity index 100%
rename from osm-mon/plugins/__init__.py
rename to osm_mon/plugins/__init__.py
diff --git a/osm-mon/plugins/vRealiseOps/.gitkeep b/osm_mon/plugins/vRealiseOps/.gitkeep
similarity index 100%
rename from osm-mon/plugins/vRealiseOps/.gitkeep
rename to osm_mon/plugins/vRealiseOps/.gitkeep
diff --git a/osm-mon/plugins/vRealiseOps/__init__.py b/osm_mon/plugins/vRealiseOps/__init__.py
similarity index 100%
rename from osm-mon/plugins/vRealiseOps/__init__.py
rename to osm_mon/plugins/vRealiseOps/__init__.py
diff --git a/osm-mon/plugins/vRealiseOps/kafka_consumer_vrops.py b/osm_mon/plugins/vRealiseOps/kafka_consumer_vrops.py
similarity index 100%
rename from osm-mon/plugins/vRealiseOps/kafka_consumer_vrops.py
rename to osm_mon/plugins/vRealiseOps/kafka_consumer_vrops.py
diff --git a/osm-mon/plugins/vRealiseOps/mon_plugin_vrops.py b/osm_mon/plugins/vRealiseOps/mon_plugin_vrops.py
similarity index 100%
rename from osm-mon/plugins/vRealiseOps/mon_plugin_vrops.py
rename to osm_mon/plugins/vRealiseOps/mon_plugin_vrops.py
diff --git a/osm-mon/plugins/vRealiseOps/plugin_receiver.py b/osm_mon/plugins/vRealiseOps/plugin_receiver.py
similarity index 100%
rename from osm-mon/plugins/vRealiseOps/plugin_receiver.py
rename to osm_mon/plugins/vRealiseOps/plugin_receiver.py
diff --git a/osm-mon/plugins/vRealiseOps/vROPs_Webservice/__init__.py b/osm_mon/plugins/vRealiseOps/vROPs_Webservice/__init__.py
similarity index 100%
rename from osm-mon/plugins/vRealiseOps/vROPs_Webservice/__init__.py
rename to osm_mon/plugins/vRealiseOps/vROPs_Webservice/__init__.py
diff --git a/osm-mon/plugins/vRealiseOps/vROPs_Webservice/install.sh b/osm_mon/plugins/vRealiseOps/vROPs_Webservice/install.sh
similarity index 100%
rename from osm-mon/plugins/vRealiseOps/vROPs_Webservice/install.sh
rename to osm_mon/plugins/vRealiseOps/vROPs_Webservice/install.sh
diff --git a/osm-mon/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice b/osm_mon/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice
similarity index 100%
rename from osm-mon/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice
rename to osm_mon/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice
diff --git a/osm-mon/plugins/vRealiseOps/vrops_config.xml b/osm_mon/plugins/vRealiseOps/vrops_config.xml
similarity index 100%
rename from osm-mon/plugins/vRealiseOps/vrops_config.xml
rename to osm_mon/plugins/vRealiseOps/vrops_config.xml
diff --git a/osm-mon/test/.gitkeep b/osm_mon/test/.gitkeep
similarity index 100%
rename from osm-mon/test/.gitkeep
rename to osm_mon/test/.gitkeep
diff --git a/osm-mon/test/CloudWatch/test_schemas/alarm_details/acknowledge_alarm.json b/osm_mon/test/CloudWatch/test_schemas/alarm_details/acknowledge_alarm.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/alarm_details/acknowledge_alarm.json
rename to osm_mon/test/CloudWatch/test_schemas/alarm_details/acknowledge_alarm.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_differentInstance.json b/osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_differentInstance.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_differentInstance.json
rename to osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_differentInstance.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_sameInstance.json b/osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_sameInstance.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_sameInstance.json
rename to osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_sameInstance.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_differentInstance.json b/osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_differentInstance.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_differentInstance.json
rename to osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_differentInstance.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_sameInstance.json b/osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_sameInstance.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_sameInstance.json
rename to osm_mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_sameInstance.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/create_alarm/operation_invalid.json b/osm_mon/test/CloudWatch/test_schemas/create_alarm/operation_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/create_alarm/operation_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/create_alarm/operation_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/create_alarm/operation_valid.json b/osm_mon/test/CloudWatch/test_schemas/create_alarm/operation_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/create_alarm/operation_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/create_alarm/operation_valid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/create_alarm/statistic_invalid.json b/osm_mon/test/CloudWatch/test_schemas/create_alarm/statistic_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/create_alarm/statistic_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/create_alarm/statistic_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/create_alarm/statistic_valid.json b/osm_mon/test/CloudWatch/test_schemas/create_alarm/statistic_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/create_alarm/statistic_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/create_alarm/statistic_valid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_invalid.json b/osm_mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_valid.json b/osm_mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_valid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_invalid.json b/osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid.json b/osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete1.json b/osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete1.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete1.json
rename to osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete1.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete2.json b/osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete2.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete2.json
rename to osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete2.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete3.json b/osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete3.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete3.json
rename to osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete3.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete4.json b/osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete4.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete4.json
rename to osm_mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete4.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_invalid.json b/osm_mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_valid.json b/osm_mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_valid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_no_arguments.json b/osm_mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_no_arguments.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_no_arguments.json
rename to osm_mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_no_arguments.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_one_argument.json b/osm_mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_one_argument.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_one_argument.json
rename to osm_mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_one_argument.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_two_arguments.json b/osm_mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_two_arguments.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_two_arguments.json
rename to osm_mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_two_arguments.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_invalid.json b/osm_mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_valid.json b/osm_mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_valid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_invalid.json b/osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_valid.json b/osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_valid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_invalid.json b/osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_valid.json b/osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_valid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/update_alarm/name_invalid.json b/osm_mon/test/CloudWatch/test_schemas/update_alarm/name_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/update_alarm/name_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/update_alarm/name_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/update_alarm/name_valid.json b/osm_mon/test/CloudWatch/test_schemas/update_alarm/name_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/update_alarm/name_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/update_alarm/name_valid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/update_alarm/operation_invalid.json b/osm_mon/test/CloudWatch/test_schemas/update_alarm/operation_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/update_alarm/operation_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/update_alarm/operation_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/update_alarm/operation_valid.json b/osm_mon/test/CloudWatch/test_schemas/update_alarm/operation_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/update_alarm/operation_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/update_alarm/operation_valid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/update_alarm/statistic_invalid.json b/osm_mon/test/CloudWatch/test_schemas/update_alarm/statistic_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/update_alarm/statistic_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/update_alarm/statistic_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/update_alarm/statistic_valid.json b/osm_mon/test/CloudWatch/test_schemas/update_alarm/statistic_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/update_alarm/statistic_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/update_alarm/statistic_valid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/update_alarm/update_alarm_new_alarm.json b/osm_mon/test/CloudWatch/test_schemas/update_alarm/update_alarm_new_alarm.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/update_alarm/update_alarm_new_alarm.json
rename to osm_mon/test/CloudWatch/test_schemas/update_alarm/update_alarm_new_alarm.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_invalid.json b/osm_mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_invalid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_invalid.json
rename to osm_mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_invalid.json
diff --git a/osm-mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_valid.json b/osm_mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_valid.json
similarity index 100%
rename from osm-mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_valid.json
rename to osm_mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_valid.json
diff --git a/osm-mon/test/CloudWatch/unit_tests_alarms.py b/osm_mon/test/CloudWatch/unit_tests_alarms.py
similarity index 100%
rename from osm-mon/test/CloudWatch/unit_tests_alarms.py
rename to osm_mon/test/CloudWatch/unit_tests_alarms.py
diff --git a/osm-mon/test/CloudWatch/unit_tests_metrics.py b/osm_mon/test/CloudWatch/unit_tests_metrics.py
similarity index 100%
rename from osm-mon/test/CloudWatch/unit_tests_metrics.py
rename to osm_mon/test/CloudWatch/unit_tests_metrics.py
diff --git a/osm-mon/test/OpenStack/__init__.py b/osm_mon/test/OpenStack/__init__.py
similarity index 100%
rename from osm-mon/test/OpenStack/__init__.py
rename to osm_mon/test/OpenStack/__init__.py
diff --git a/osm-mon/test/OpenStack/test_alarm_req.py b/osm_mon/test/OpenStack/test_alarm_req.py
similarity index 100%
rename from osm-mon/test/OpenStack/test_alarm_req.py
rename to osm_mon/test/OpenStack/test_alarm_req.py
diff --git a/osm-mon/test/OpenStack/test_alarming.py b/osm_mon/test/OpenStack/test_alarming.py
similarity index 100%
rename from osm-mon/test/OpenStack/test_alarming.py
rename to osm_mon/test/OpenStack/test_alarming.py
diff --git a/osm-mon/test/OpenStack/test_common.py b/osm_mon/test/OpenStack/test_common.py
similarity index 100%
rename from osm-mon/test/OpenStack/test_common.py
rename to osm_mon/test/OpenStack/test_common.py
diff --git a/osm-mon/test/OpenStack/test_metric_calls.py b/osm_mon/test/OpenStack/test_metric_calls.py
similarity index 100%
rename from osm-mon/test/OpenStack/test_metric_calls.py
rename to osm_mon/test/OpenStack/test_metric_calls.py
diff --git a/osm-mon/test/OpenStack/test_metric_req.py b/osm_mon/test/OpenStack/test_metric_req.py
similarity index 100%
rename from osm-mon/test/OpenStack/test_metric_req.py
rename to osm_mon/test/OpenStack/test_metric_req.py
diff --git a/osm-mon/test/OpenStack/test_responses.py b/osm_mon/test/OpenStack/test_responses.py
similarity index 100%
rename from osm-mon/test/OpenStack/test_responses.py
rename to osm_mon/test/OpenStack/test_responses.py
diff --git a/osm-mon/test/OpenStack/test_settings.py b/osm_mon/test/OpenStack/test_settings.py
similarity index 100%
rename from osm-mon/test/OpenStack/test_settings.py
rename to osm_mon/test/OpenStack/test_settings.py
diff --git a/osm-mon/test/__init__.py b/osm_mon/test/__init__.py
similarity index 100%
rename from osm-mon/test/__init__.py
rename to osm_mon/test/__init__.py
diff --git a/osm-mon/test/core/__init__.py b/osm_mon/test/core/__init__.py
similarity index 100%
rename from osm-mon/test/core/__init__.py
rename to osm_mon/test/core/__init__.py
diff --git a/osm-mon/test/core/kafka_test.py b/osm_mon/test/core/kafka_test.py
similarity index 100%
rename from osm-mon/test/core/kafka_test.py
rename to osm_mon/test/core/kafka_test.py
diff --git a/osm-mon/test/core/test_producer.py b/osm_mon/test/core/test_producer.py
similarity index 100%
rename from osm-mon/test/core/test_producer.py
rename to osm_mon/test/core/test_producer.py
diff --git a/setup.py b/setup.py
index 6b1faab..b91ff35 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@
 __date__   = "14/Sep/2017"
 from setuptools import setup
 from os import system
-_name = 'osm-mon'
+_name = 'osm_mon'
 _version = '1.0'
 _description = 'OSM Monitoring Module'
 _author = 'Prithiv Mohan'
@@ -44,12 +44,12 @@
       license = _license,
       packages = [_name],
       package_dir = {_name: _name},
-      package_data = {_name: ['osm-mon/core/message_bus/*.py', 'osm-mon/core/models/*.json',
-                      'osm-mon/plugins/OpenStack/Aodh/*.py', 'osm-mon/plugins/OpenStack/Gnocchi/*.py',
-                      'osm-mon/plugins/vRealiseOps/*', 'osm-mon/plugins/CloudWatch/*']},
+      package_data = {_name: ['osm_mon/core/message_bus/*.py', 'osm_mon/core/models/*.json',
+                      'osm_mon/plugins/OpenStack/Aodh/*.py', 'osm_mon/plugins/OpenStack/Gnocchi/*.py',
+                      'osm_mon/plugins/vRealiseOps/*', 'osm_mon/plugins/CloudWatch/*']},
       data_files = [('/etc/systemd/system/', ['scripts/kafka.sh']),
                    ],
-      scripts=['osm-mon/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice',
-               'kafkad', 'osm-mon/core/message_bus/common_consumer'],
+      scripts=['osm_mon/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice',
+               'kafkad', 'osm_mon/core/message_bus/common_consumer'],
       include_package_data=True,
       )
diff --git a/stage-archive.sh b/stage-archive.sh
deleted file mode 100755
index 8f6e11d..0000000
--- a/stage-archive.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2017 Intel Research and Development Ireland Limited
-# *************************************************************
-
-# This file is part of OSM Monitoring module
-# All Rights Reserved to Intel Corporation
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-
-#         http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# For those usages not covered by the Apache License, Version 2.0 please
-# contact: prithiv.mohan@intel.com or adrian.hoban@intel.com
-
-#__author__ = "Prithiv Mohan"
-#__date__   = "25/Sep/2017"
-
-
-#!/bin/sh
-rm -rf pool
-rm -rf dists
-mkdir -p pool/MON
-mv .build/*.deb pool/MON/
-mkdir -p dists/unstable/MON/binary-amd64/
-apt-ftparchive packages pool/MON > dists/unstable/MON/binary-amd64/Packages
-gzip -9fk dists/unstable/MON/binary-amd64/Packages
diff --git a/stage-build.sh b/stage-build.sh
deleted file mode 100755
index e78acc0..0000000
--- a/stage-build.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2017 Intel Research and Development Ireland Limited
-# *************************************************************
-
-# This file is part of OSM Monitoring module
-# All Rights Reserved to Intel Corporation
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-
-#         http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# For those usages not covered by the Apache License, Version 2.0 please
-# contact: prithiv.mohan@intel.com or adrian.hoban@intel.com
-
-#__author__ = "Prithiv Mohan"
-#__date__   = "14/Sep/2017"
-
-#!/bin/bash
-make clean all BRANCH=master
-make package
diff --git a/stage-test.sh b/stage-test.sh
deleted file mode 100755
index c647565..0000000
--- a/stage-test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2017 Intel Research and Development Ireland Limited
-# *************************************************************
-
-# This file is part of OSM Monitoring module
-# All Rights Reserved to Intel Corporation
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-
-#         http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# For those usages not covered by the Apache License, Version 2.0 please
-# contact: prithiv.mohan@intel.com or adrian.hoban@intel.com
-
-#__author__ = "Prithiv Mohan"
-#__date__   = "14/Sep/2017"
-
-#!/bin/bash
-echo "UNITTEST"