diff --git a/README.md b/README.md
index 6b01d98..a47da20 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 RIC Alarm Manager and Library Interface
 =======================================
 
+
 This repository containts Golang implementation of Alarm Manager and related application library interface.
 
 Architecture
diff --git a/alarm/alarm.go b/alarm/alarm.go
index 36fea49..25c1819 100755
--- a/alarm/alarm.go
+++ b/alarm/alarm.go
@@ -180,9 +180,9 @@
 	// Setup static RT for alarm system
 	endpoint := ALARM_MANAGER_RMR_URL
 	if r.moId == "my-pod" {
-		endpoint = "localhost:4560"
+		endpoint = "127.0.0.1:4560"
 	} else if r.moId == "my-pod-lib" {
-		endpoint = "localhost:4588"
+		endpoint = "127.0.0.1:4588"
 	}
 
 	alarmRT := fmt.Sprintf("newrt|start\nrte|13111|%s\nnewrt|end\n", endpoint)
diff --git a/container-tag.yaml b/build/container-tag.yaml
similarity index 100%
rename from container-tag.yaml
rename to build/container-tag.yaml
diff --git a/config/config-file.json b/config/config-file.json
index 4f18d49..9f0597e 100755
--- a/config/config-file.json
+++ b/config/config-file.json
@@ -1,6 +1,6 @@
 {
     "local": {
-        "host": ":8089"
+        "host": ":8080"
     },
     "logger": {
         "level": 4
diff --git a/alarm-schema.json b/schemas/alarm-schema.json
similarity index 100%
rename from alarm-schema.json
rename to schemas/alarm-schema.json