diff --git a/README.md b/README.md
index 52313b4c..53184af6 100644
--- a/README.md
+++ b/README.md
@@ -19,22 +19,14 @@ A change has been submitted to StackForge to switch to bare-trusty for this buil
 
 ### Application Specific Sub-Projects
 
-* [mon-model](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-model) - Common domain and event models for monitoring services.
+* [monasca-common-model](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-model) - Common domain and event models for monitoring services.
 
 ### Platform Sub-Projects
 
-* [mon-dropwizard](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-dropwizard) - Utilities for building and testing dropwizard services.
-* [mon-kafka](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-kafka) - Various utilities for working with Kafka.
-* [mon-persistence](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-persistence) - Persistence related infrastructure and utilities.
-* [mon-service](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-service) - Simple service abstractions and utilities.
-* [mon-streaming](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-streaming) - Streaming related utilities.
-* [mon-testing](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-testing) - A set of testing related dependencies.
-* [mon-util](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-util) - Various utilities such as for serialization, dependency injection, date and time, invocation retries, concurrency, etc.
-
-### Deploying to Nexus
-
-To deploy to nexus, just run the command below, inserting a version number that is greater than the current nexus version (this command is usually performed by Jenkins):
-
-```
-mvn deploy -DBUILD_NUM=${BUILD_NUMBER}
-```
+* [monasca-common-dropwizard](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-dropwizard) - Utilities for building and testing dropwizard services.
+* [monasca-common-kafka](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-kafka) - Various utilities for working with Kafka.
+* [monasca-common-persistence](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-persistence) - Persistence related infrastructure and utilities.
+* [monasca-common-service](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-service) - Simple service abstractions and utilities.
+* [monasca-common-streaming](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-streaming) - Streaming related utilities.
+* [monasca-common-testing](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-testing) - A set of testing related dependencies.
+* [monasca-common-util](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-util) - Various utilities such as for serialization, dependency injection, date and time, invocation retries, concurrency, etc.
diff --git a/java/monasca-common-dropwizard/src/main/java/com/hpcloud/dropwizard/persistence/DatabaseModule.java b/java/monasca-common-dropwizard/src/main/java/monasca/common/dropwizard/persistence/DatabaseModule.java
similarity index 97%
rename from java/monasca-common-dropwizard/src/main/java/com/hpcloud/dropwizard/persistence/DatabaseModule.java
rename to java/monasca-common-dropwizard/src/main/java/monasca/common/dropwizard/persistence/DatabaseModule.java
index efc15c31..fb674426 100644
--- a/java/monasca-common-dropwizard/src/main/java/com/hpcloud/dropwizard/persistence/DatabaseModule.java
+++ b/java/monasca-common-dropwizard/src/main/java/monasca/common/dropwizard/persistence/DatabaseModule.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.dropwizard.persistence;
+package monasca.common.dropwizard.persistence;
 
 import io.dropwizard.db.DataSourceFactory;
 import io.dropwizard.jdbi.DBIFactory;
diff --git a/java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractAppTest.java b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractAppTest.java
similarity index 98%
rename from java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractAppTest.java
rename to java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractAppTest.java
index a6aaa40c..be68dd01 100644
--- a/java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractAppTest.java
+++ b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractAppTest.java
@@ -1,4 +1,4 @@
-package com.hpcloud.dropwizard;
+package monasca.common.dropwizard;
 
 import io.dropwizard.Application;
 import io.dropwizard.Configuration;
@@ -120,4 +120,4 @@ public abstract class AbstractAppTest<C extends Configuration> {
   public Environment getEnvironment() {
     return environment;
   }
-}
\ No newline at end of file
+}
diff --git a/java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractResourceTest.java b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractResourceTest.java
similarity index 99%
rename from java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractResourceTest.java
rename to java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractResourceTest.java
index b7541248..695fa6f4 100644
--- a/java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractResourceTest.java
+++ b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractResourceTest.java
@@ -1,4 +1,4 @@
-package com.hpcloud.dropwizard;
+package monasca.common.dropwizard;
 
 import io.dropwizard.Configuration;
 import io.dropwizard.configuration.ConfigurationFactory;
@@ -130,4 +130,4 @@ public abstract class AbstractResourceTest {
   }
 
   protected abstract void setupResources() throws Exception;
-}
\ No newline at end of file
+}
diff --git a/java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/JsonHelpers.java b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/JsonHelpers.java
similarity index 98%
rename from java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/JsonHelpers.java
rename to java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/JsonHelpers.java
index 3e92d6c9..f20c5503 100644
--- a/java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/JsonHelpers.java
+++ b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/JsonHelpers.java
@@ -1,4 +1,4 @@
-package com.hpcloud.dropwizard;
+package monasca.common.dropwizard;
 
 import io.dropwizard.testing.FixtureHelpers;
 
diff --git a/java/monasca-common-influxdb/src/main/java/com/hpcloud/configuration/DatabaseConfiguration.java b/java/monasca-common-influxdb/src/main/java/monasca/common/configuration/DatabaseConfiguration.java
similarity index 95%
rename from java/monasca-common-influxdb/src/main/java/com/hpcloud/configuration/DatabaseConfiguration.java
rename to java/monasca-common-influxdb/src/main/java/monasca/common/configuration/DatabaseConfiguration.java
index 2e1511b5..de8ec9be 100644
--- a/java/monasca-common-influxdb/src/main/java/com/hpcloud/configuration/DatabaseConfiguration.java
+++ b/java/monasca-common-influxdb/src/main/java/monasca/common/configuration/DatabaseConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/java/monasca-common-influxdb/src/main/java/com/hpcloud/configuration/InfluxDbConfiguration.java b/java/monasca-common-influxdb/src/main/java/monasca/common/configuration/InfluxDbConfiguration.java
similarity index 96%
rename from java/monasca-common-influxdb/src/main/java/com/hpcloud/configuration/InfluxDbConfiguration.java
rename to java/monasca-common-influxdb/src/main/java/monasca/common/configuration/InfluxDbConfiguration.java
index a194af53..956626c0 100644
--- a/java/monasca-common-influxdb/src/main/java/com/hpcloud/configuration/InfluxDbConfiguration.java
+++ b/java/monasca-common-influxdb/src/main/java/monasca/common/configuration/InfluxDbConfiguration.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerConfiguration.java b/java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaConsumerConfiguration.java
similarity index 99%
rename from java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerConfiguration.java
rename to java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaConsumerConfiguration.java
index 1b95e4bb..6bcd0cf4 100644
--- a/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerConfiguration.java
+++ b/java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaConsumerConfiguration.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import java.io.Serializable;
 
diff --git a/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerProperties.java b/java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaConsumerProperties.java
similarity index 98%
rename from java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerProperties.java
rename to java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaConsumerProperties.java
index a487c267..f6133f7a 100644
--- a/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerProperties.java
+++ b/java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaConsumerProperties.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import java.io.Serializable;
 import java.util.Properties;
diff --git a/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerConfiguration.java b/java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaProducerConfiguration.java
similarity index 98%
rename from java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerConfiguration.java
rename to java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaProducerConfiguration.java
index 57ad07f2..11389608 100644
--- a/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerConfiguration.java
+++ b/java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaProducerConfiguration.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import java.io.Serializable;
 
diff --git a/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerProperties.java b/java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaProducerProperties.java
similarity index 98%
rename from java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerProperties.java
rename to java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaProducerProperties.java
index bfd2d994..54d95fa2 100644
--- a/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerProperties.java
+++ b/java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaProducerProperties.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import java.util.Properties;
 
diff --git a/java/monasca-common-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaConfiguration.java b/java/monasca-common-kafka/src/main/java/monasca/common/messaging/kafka/KafkaConfiguration.java
similarity index 95%
rename from java/monasca-common-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaConfiguration.java
rename to java/monasca-common-kafka/src/main/java/monasca/common/messaging/kafka/KafkaConfiguration.java
index 5fb819fa..3a237163 100644
--- a/java/monasca-common-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaConfiguration.java
+++ b/java/monasca-common-kafka/src/main/java/monasca/common/messaging/kafka/KafkaConfiguration.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.messaging.kafka;
+package monasca.common.messaging.kafka;
 
 import org.hibernate.validator.constraints.NotEmpty;
 
diff --git a/java/monasca-common-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaHealthCheck.java b/java/monasca-common-kafka/src/main/java/monasca/common/messaging/kafka/KafkaHealthCheck.java
similarity index 99%
rename from java/monasca-common-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaHealthCheck.java
rename to java/monasca-common-kafka/src/main/java/monasca/common/messaging/kafka/KafkaHealthCheck.java
index e8961eab..28b3176d 100644
--- a/java/monasca-common-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaHealthCheck.java
+++ b/java/monasca-common-kafka/src/main/java/monasca/common/messaging/kafka/KafkaHealthCheck.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.messaging.kafka;
+package monasca.common.messaging.kafka;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/java/monasca-common-kafka/src/main/resources/com/hpcloud/kafka-consumer-config-yml b/java/monasca-common-kafka/src/main/resources/monasca/common/kafka-consumer-config-yml
similarity index 100%
rename from java/monasca-common-kafka/src/main/resources/com/hpcloud/kafka-consumer-config-yml
rename to java/monasca-common-kafka/src/main/resources/monasca/common/kafka-consumer-config-yml
diff --git a/java/monasca-common-kafka/src/main/resources/com/hpcloud/kafka-producer-config.yml b/java/monasca-common-kafka/src/main/resources/monasca/common/kafka-producer-config.yml
similarity index 90%
rename from java/monasca-common-kafka/src/main/resources/com/hpcloud/kafka-producer-config.yml
rename to java/monasca-common-kafka/src/main/resources/monasca/common/kafka-producer-config.yml
index 1e517ba0..7932b741 100644
--- a/java/monasca-common-kafka/src/main/resources/com/hpcloud/kafka-producer-config.yml
+++ b/java/monasca-common-kafka/src/main/resources/monasca/common/kafka-producer-config.yml
@@ -18,7 +18,7 @@ serializerClass: kafkaserializerStringEncoder
 #keyserializerclass:
 
 #Required
-partitionerClass: comhpcloudSimplePartitioner
+partitionerClass: monascaSimplePartitioner
 
 #compressionCodec:
 #compressedTopics :
@@ -30,4 +30,4 @@ partitionerClass: comhpcloudSimplePartitioner
 #queueEnqueueTimeoutMs:
 #batchNumMessages:
 #sendBufferBytes:
-#clientId:
\ No newline at end of file
+#clientId:
diff --git a/java/monasca-common-kafka/src/test/java/com/hpcloud/messaging/kafka/KafkaHealthCheckTest.java b/java/monasca-common-kafka/src/test/java/monasca/common/messaging/kafka/KafkaHealthCheckTest.java
similarity index 95%
rename from java/monasca-common-kafka/src/test/java/com/hpcloud/messaging/kafka/KafkaHealthCheckTest.java
rename to java/monasca-common-kafka/src/test/java/monasca/common/messaging/kafka/KafkaHealthCheckTest.java
index 589b212c..e04d67b4 100644
--- a/java/monasca-common-kafka/src/test/java/com/hpcloud/messaging/kafka/KafkaHealthCheckTest.java
+++ b/java/monasca-common-kafka/src/test/java/monasca/common/messaging/kafka/KafkaHealthCheckTest.java
@@ -1,4 +1,4 @@
-package com.hpcloud.messaging.kafka;
+package monasca.common.messaging.kafka;
 
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
diff --git a/java/monasca-common-kafka/src/test/resources/log4j.properties b/java/monasca-common-kafka/src/test/resources/log4j.properties
index 9ee0b0fb..3c39d2d0 100644
--- a/java/monasca-common-kafka/src/test/resources/log4j.properties
+++ b/java/monasca-common-kafka/src/test/resources/log4j.properties
@@ -1,8 +1,8 @@
 log4j.rootLogger=INFO, console
 
-log4j.logger.com.hpcloud.mon=DEBUG
-log4j.logger.com.hpcloud.messaging=DEBUG
+log4j.logger.monasca.common.configuration=DEBUG
+log4j.logger.monasca.common.messaging=DEBUG
 
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.conversionPattern=%-5p [%d{ISO8601}] [%.18t] %c{1}: %m%n
\ No newline at end of file
+log4j.appender.console.layout.conversionPattern=%-5p [%d{ISO8601}] [%.18t] %c{1}: %m%n
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthClient.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClient.java
similarity index 94%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthClient.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClient.java
index 7c508e47..3fc20891 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthClient.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClient.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 
 import java.util.Map;
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthClientFactory.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClientFactory.java
similarity index 99%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthClientFactory.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClientFactory.java
index a890b7b2..b2d8abaf 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthClientFactory.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClientFactory.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import org.apache.commons.pool.impl.GenericObjectPool;
 
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthConnectionException.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConnectionException.java
similarity index 91%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthConnectionException.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConnectionException.java
index 778b148f..661cbfad 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthConnectionException.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConnectionException.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 /**
  * An exception to indicate any connection issue.
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthConstants.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConstants.java
similarity index 96%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthConstants.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConstants.java
index 2315bd7d..c2cadad8 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthConstants.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConstants.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 public interface AuthConstants {
   /**
@@ -231,4 +231,4 @@ public interface AuthConstants {
   public static final String ADMIN_SECRET_KEY = "AdminSecretKey";
   public static final String ADMIN_PROJECT_ID = "AdminProjectId";
 
-}
\ No newline at end of file
+}
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthException.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java
similarity index 90%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthException.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java
index 345e804f..7a641372 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthException.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 /**
  * An exception to indicate any authentication error.
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/CatalogV3.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/CatalogV3.java
similarity index 92%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/CatalogV3.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/CatalogV3.java
index c2de7cda..a7093694 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/CatalogV3.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/CatalogV3.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import java.util.List;
 
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/Config.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/Config.java
similarity index 99%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/Config.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/Config.java
index 379b672e..d636d034 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/Config.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/Config.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/ExceptionHandlerUtil.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ExceptionHandlerUtil.java
similarity index 96%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/ExceptionHandlerUtil.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/ExceptionHandlerUtil.java
index 00b88320..485a2b52 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/ExceptionHandlerUtil.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ExceptionHandlerUtil.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 public class ExceptionHandlerUtil {
 	
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/FilterUtils.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/FilterUtils.java
similarity index 86%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/FilterUtils.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/FilterUtils.java
index d922cab6..1e1bad64 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/FilterUtils.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/FilterUtils.java
@@ -1,25 +1,25 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 
-import static com.hpcloud.middleware.AuthConstants.AUTH_IDENTITY_STATUS;
+import static monasca.common.middleware.AuthConstants.AUTH_IDENTITY_STATUS;
 
-import static com.hpcloud.middleware.AuthConstants.AUTH_ROLES;
-import static com.hpcloud.middleware.AuthConstants.AUTH_TENANT_NAME;
+import static monasca.common.middleware.AuthConstants.AUTH_ROLES;
+import static monasca.common.middleware.AuthConstants.AUTH_TENANT_NAME;
 
-import static com.hpcloud.middleware.AuthConstants.AUTH_USER_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_DOMAIN_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_DOMAIN_NAME;
-import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_NAME;
-import static com.hpcloud.middleware.AuthConstants.AUTH_TENANT_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_USER_NAME;
-import static com.hpcloud.middleware.AuthConstants.IdentityStatus;
-import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_NAME;
-import static com.hpcloud.middleware.AuthConstants.AUTH_USER_DOMAIN_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_USER_DOMAIN_NAME;
-import static com.hpcloud.middleware.AuthConstants.AUTH_HP_IDM_ROLES;
-import static com.hpcloud.middleware.AuthConstants.AUTH_SERVICE_CATALOG;
+import static monasca.common.middleware.AuthConstants.AUTH_USER_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_DOMAIN_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_DOMAIN_NAME;
+import static monasca.common.middleware.AuthConstants.AUTH_PROJECT_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_PROJECT_NAME;
+import static monasca.common.middleware.AuthConstants.AUTH_TENANT_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_USER_NAME;
+import static monasca.common.middleware.AuthConstants.IdentityStatus;
+import static monasca.common.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_NAME;
+import static monasca.common.middleware.AuthConstants.AUTH_USER_DOMAIN_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_USER_DOMAIN_NAME;
+import static monasca.common.middleware.AuthConstants.AUTH_HP_IDM_ROLES;
+import static monasca.common.middleware.AuthConstants.AUTH_SERVICE_CATALOG;
 
 import java.io.IOException;
 import java.lang.reflect.Modifier;
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpAuthClient.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpAuthClient.java
similarity index 98%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpAuthClient.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpAuthClient.java
index d7b57e70..417bb323 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpAuthClient.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpAuthClient.java
@@ -1,7 +1,7 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
-import static com.hpcloud.middleware.AuthConstants.TOKEN;
-import static com.hpcloud.middleware.AuthConstants.AUTH_SUBJECT_TOKEN;
+import static monasca.common.middleware.AuthConstants.TOKEN;
+import static monasca.common.middleware.AuthConstants.AUTH_SUBJECT_TOKEN;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpClientFactory.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientFactory.java
similarity index 95%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpClientFactory.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientFactory.java
index 79318302..789086af 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpClientFactory.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientFactory.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import org.apache.commons.pool.impl.GenericObjectPool;
 
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpClientPoolFactory.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientPoolFactory.java
similarity index 99%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpClientPoolFactory.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientPoolFactory.java
index 18609a17..e454615f 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpClientPoolFactory.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientPoolFactory.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpPoolCleaner.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpPoolCleaner.java
similarity index 97%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpPoolCleaner.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpPoolCleaner.java
index 1d01bb57..c76e53bc 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpPoolCleaner.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpPoolCleaner.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/ServiceUnavailableException.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ServiceUnavailableException.java
similarity index 90%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/ServiceUnavailableException.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/ServiceUnavailableException.java
index 079dbece..8581a343 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/ServiceUnavailableException.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ServiceUnavailableException.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 /**
  * Created by johnderr on 6/25/14.
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenAuth.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenAuth.java
similarity index 96%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenAuth.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenAuth.java
index 6fe387a7..bd225d1a 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenAuth.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenAuth.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author liemmn
  */
-public class TokenAuth implements Filter, com.hpcloud.middleware.AuthConstants {
+public class TokenAuth implements Filter, monasca.common.middleware.AuthConstants {
 
   private static final String TOKEN_NOTFOUND = "Bad Request: Token not found in the request";
   private static final String SERVICE_IDS_PARAM = "serviceIds";
@@ -46,7 +46,7 @@ public class TokenAuth implements Filter, com.hpcloud.middleware.AuthConstants {
   private static final String SERVICE_CATALOG_PARAM = "includeCatalog";
   private static final String API_VERSION_PARAM = "apiVersion";
 
-  private final com.hpcloud.middleware.Config appConfig = Config.getInstance();
+  private final monasca.common.middleware.Config appConfig = Config.getInstance();
 
   private FilterConfig filterConfig;
 
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenCache.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenCache.java
similarity index 98%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenCache.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenCache.java
index 6d6b7d27..732070e5 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenCache.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenCache.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import com.google.common.cache.*;
 import org.apache.http.client.ClientProtocolException;
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenExceptionHandler.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenExceptionHandler.java
similarity index 99%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenExceptionHandler.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenExceptionHandler.java
index 4871c72e..1f956ba0 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenExceptionHandler.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenExceptionHandler.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import java.io.IOException;
 
diff --git a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/UnavailableException.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/UnavailableException.java
similarity index 90%
rename from java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/UnavailableException.java
rename to java/monasca-common-middleware/src/main/java/monasca/common/middleware/UnavailableException.java
index c07cacac..dad11ce9 100644
--- a/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/UnavailableException.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/UnavailableException.java
@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 /**
  * Created by johnderr on 6/25/14.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ComputeServiceInfo.java b/java/monasca-common-model/src/main/java/monasca/common/model/ComputeServiceInfo.java
similarity index 97%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ComputeServiceInfo.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/ComputeServiceInfo.java
index 7f5ab612..aff0b638 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ComputeServiceInfo.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/ComputeServiceInfo.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ObjectStoreServiceInfo.java b/java/monasca-common-model/src/main/java/monasca/common/model/ObjectStoreServiceInfo.java
similarity index 97%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ObjectStoreServiceInfo.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/ObjectStoreServiceInfo.java
index e3aa38f4..84068335 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ObjectStoreServiceInfo.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/ObjectStoreServiceInfo.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ServiceInfo.java b/java/monasca-common-model/src/main/java/monasca/common/model/ServiceInfo.java
similarity index 96%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ServiceInfo.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/ServiceInfo.java
index bab45080..70985b0f 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ServiceInfo.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/ServiceInfo.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import java.util.List;
 import java.util.Set;
@@ -37,4 +37,4 @@ interface ServiceInfo {
    * Returns the supported metric names.
    */
   Set<String> getSupportedMetricNames();
-}
\ No newline at end of file
+}
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/Services.java b/java/monasca-common-model/src/main/java/monasca/common/model/Services.java
similarity index 98%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/Services.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/Services.java
index 2d26a197..e1547e4d 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/Services.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/Services.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/VolumeServiceInfo.java b/java/monasca-common-model/src/main/java/monasca/common/model/VolumeServiceInfo.java
similarity index 97%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/VolumeServiceInfo.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/VolumeServiceInfo.java
index 54edfcbd..8b5fdc84 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/VolumeServiceInfo.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/VolumeServiceInfo.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AggregateFunction.java b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AggregateFunction.java
similarity index 80%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AggregateFunction.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/alarm/AggregateFunction.java
index 2c9448f6..3fe6beda 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AggregateFunction.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AggregateFunction.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.hpcloud.util.stats.Statistic;
-import com.hpcloud.util.stats.Statistics.Average;
-import com.hpcloud.util.stats.Statistics.Count;
-import com.hpcloud.util.stats.Statistics.Max;
-import com.hpcloud.util.stats.Statistics.Min;
-import com.hpcloud.util.stats.Statistics.Sum;
+import monasca.common.util.stats.Statistic;
+import monasca.common.util.stats.Statistics.Average;
+import monasca.common.util.stats.Statistics.Count;
+import monasca.common.util.stats.Statistics.Max;
+import monasca.common.util.stats.Statistics.Min;
+import monasca.common.util.stats.Statistics.Sum;
 
 public enum AggregateFunction {
   MIN, MAX, SUM, COUNT, AVG;
@@ -50,4 +50,4 @@ public enum AggregateFunction {
       return Max.class;
     return null;
   }
-}
\ No newline at end of file
+}
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpression.java b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmExpression.java
similarity index 98%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpression.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmExpression.java
index 5f566e72..bf8e2800 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpression.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmExpression.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +27,7 @@ import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.hpcloud.util.Stack;
+import monasca.common.util.Stack;
 
 /**
  * Alarm expression value object.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionErrorListener.java b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmExpressionErrorListener.java
similarity index 96%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionErrorListener.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmExpressionErrorListener.java
index 0c14dde5..b969aef8 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionErrorListener.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmExpressionErrorListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.RecognitionException;
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmOperator.java b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmOperator.java
similarity index 97%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmOperator.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmOperator.java
index 74f62959..cf5258b5 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmOperator.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmOperator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
@@ -64,4 +64,4 @@ public enum AlarmOperator {
   public String toString() {
     return operatorSymbols;
   }
-}
\ No newline at end of file
+}
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmState.java b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmState.java
similarity index 94%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmState.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmState.java
index c376f978..542f2cc6 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmState.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmState.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
@@ -25,4 +25,4 @@ public enum AlarmState {
   public static AlarmState fromJson(String text) {
     return valueOf(text.toUpperCase());
   }
-}
\ No newline at end of file
+}
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpression.java b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSubExpression.java
similarity index 95%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpression.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSubExpression.java
index 644aabc6..21e83e35 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpression.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSubExpression.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import java.io.Serializable;
 
@@ -24,9 +24,9 @@ import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.hpcloud.mon.common.model.alarm.AlarmExpressionLexer;
-import com.hpcloud.mon.common.model.alarm.AlarmExpressionParser;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.alarm.AlarmExpressionLexer;
+import monasca.common.model.alarm.AlarmExpressionParser;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Alarm sub expression value object.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionListener.java b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSubExpressionListener.java
similarity index 98%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionListener.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSubExpressionListener.java
index 9b8aa6b4..83772418 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionListener.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSubExpressionListener.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Complex alarm parser lister for sub expression extraction.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanExpression.java b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/BooleanExpression.java
similarity index 97%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanExpression.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/alarm/BooleanExpression.java
index cbd1fa0c..668ea490 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanExpression.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/BooleanExpression.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanOperator.java b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/BooleanOperator.java
similarity index 95%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanOperator.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/alarm/BooleanOperator.java
index 96009dec..1e9dde7f 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanOperator.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/BooleanOperator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 /**
  * Boolean operator.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/domain/common/AbstractEntity.java b/java/monasca-common-model/src/main/java/monasca/common/model/domain/common/AbstractEntity.java
similarity index 96%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/domain/common/AbstractEntity.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/domain/common/AbstractEntity.java
index 5436dc41..29b8db93 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/domain/common/AbstractEntity.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/domain/common/AbstractEntity.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.domain.common;
+package monasca.common.model.domain.common;
 
 /**
  * Defines an entity with a surrogate key.
diff --git a/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmCreatedEvent.java b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmCreatedEvent.java
new file mode 100644
index 00000000..c66cc1ea
--- /dev/null
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmCreatedEvent.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ * 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.
+ */
+package monasca.common.model.event;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonRootName;
+import monasca.common.model.alarm.AlarmSubExpression;
+
+/**
+ * Represents an alarm having been created.
+ */
+@JsonRootName(value = "alarm-created")
+public class AlarmCreatedEvent implements Serializable {
+  private static final long serialVersionUID = -2971178340115415059L;
+
+  public String tenantId;
+  public String alarmId;
+  public String alarmName;
+  public String alarmExpression;
+  public Map<String, AlarmSubExpression> alarmSubExpressions;
+
+  public AlarmCreatedEvent() {
+  }
+
+  public AlarmCreatedEvent(String tenantId, String alarmId, String alarmName,
+      String alarmExpression, Map<String, AlarmSubExpression> alarmSubExpressions) {
+    this.tenantId = tenantId;
+    this.alarmId = alarmId;
+    this.alarmName = alarmName;
+    this.alarmExpression = alarmExpression;
+    this.alarmSubExpressions = alarmSubExpressions;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    AlarmCreatedEvent other = (AlarmCreatedEvent) obj;
+    if (alarmExpression == null) {
+      if (other.alarmExpression != null)
+        return false;
+    } else if (!alarmExpression.equals(other.alarmExpression))
+      return false;
+    if (alarmId == null) {
+      if (other.alarmId != null)
+        return false;
+    } else if (!alarmId.equals(other.alarmId))
+      return false;
+    if (alarmName == null) {
+      if (other.alarmName != null)
+        return false;
+    } else if (!alarmName.equals(other.alarmName))
+      return false;
+    if (alarmSubExpressions == null) {
+      if (other.alarmSubExpressions != null)
+        return false;
+    } else if (!alarmSubExpressions.equals(other.alarmSubExpressions))
+      return false;
+    if (tenantId == null) {
+      if (other.tenantId != null)
+        return false;
+    } else if (!tenantId.equals(other.tenantId))
+      return false;
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + ((alarmExpression == null) ? 0 : alarmExpression.hashCode());
+    result = prime * result + ((alarmId == null) ? 0 : alarmId.hashCode());
+    result = prime * result + ((alarmName == null) ? 0 : alarmName.hashCode());
+    result = prime * result + ((alarmSubExpressions == null) ? 0 : alarmSubExpressions.hashCode());
+    result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode());
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    return String.format(
+        "AlarmCreatedEvent [tenantId=%s, alarmId=%s, alarmName=%s, expression=%s]", tenantId,
+        alarmId, alarmName, alarmExpression);
+  }
+}
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDefinitionCreatedEvent.java b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionCreatedEvent.java
similarity index 97%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDefinitionCreatedEvent.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionCreatedEvent.java
index ebc9f91a..7bf47c7e 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDefinitionCreatedEvent.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionCreatedEvent.java
@@ -11,14 +11,14 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
+import monasca.common.model.alarm.AlarmSubExpression;
 
 /**
  * Represents an alarm definition having been created.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDefinitionDeletedEvent.java b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionDeletedEvent.java
similarity index 96%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDefinitionDeletedEvent.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionDeletedEvent.java
index e0a7f3e6..24584ad9 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDefinitionDeletedEvent.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionDeletedEvent.java
@@ -11,13 +11,13 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.io.Serializable;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Represents an alarm definition having been deleted.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDefinitionUpdatedEvent.java b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionUpdatedEvent.java
similarity index 98%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDefinitionUpdatedEvent.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionUpdatedEvent.java
index 88781199..33f51c0b 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDefinitionUpdatedEvent.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionUpdatedEvent.java
@@ -11,14 +11,14 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
+import monasca.common.model.alarm.AlarmSubExpression;
 
 /**
  * Represents an alarm definition having been updated.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDeletedEvent.java b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDeletedEvent.java
similarity index 95%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDeletedEvent.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDeletedEvent.java
index 1ecbaccb..0d8f4591 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDeletedEvent.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDeletedEvent.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.io.Serializable;
 import java.util.List;
@@ -19,8 +19,8 @@ import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
 
-import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.alarm.AlarmSubExpression;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Represents an alarm having been deleted.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmStateTransitionedEvent.java b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmStateTransitionedEvent.java
similarity index 97%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmStateTransitionedEvent.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmStateTransitionedEvent.java
index efac6634..b7a822f4 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmStateTransitionedEvent.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmStateTransitionedEvent.java
@@ -11,13 +11,13 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.hpcloud.mon.common.model.alarm.AlarmState;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.alarm.AlarmState;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Represents an alarm state transition having occurred.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmUpdatedEvent.java b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmUpdatedEvent.java
similarity index 94%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmUpdatedEvent.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmUpdatedEvent.java
index 1369d104..f85400ed 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmUpdatedEvent.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmUpdatedEvent.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.io.Serializable;
 import java.util.List;
@@ -19,9 +19,9 @@ import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
 
-import com.hpcloud.mon.common.model.alarm.AlarmState;
-import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.alarm.AlarmState;
+import monasca.common.model.alarm.AlarmSubExpression;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Represents an alarm having been updated.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/Metric.java b/java/monasca-common-model/src/main/java/monasca/common/model/metric/Metric.java
similarity index 99%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/Metric.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/metric/Metric.java
index 7166b091..5431468c 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/Metric.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/metric/Metric.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import java.io.Serializable;
 
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricDefinition.java b/java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricDefinition.java
similarity index 98%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricDefinition.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricDefinition.java
index d132ec4e..5cbd25b3 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricDefinition.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricDefinition.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import java.io.Serializable;
 import java.util.Map;
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelope.java b/java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricEnvelope.java
similarity index 96%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelope.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricEnvelope.java
index 9ee84568..6ca8e8e8 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelope.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricEnvelope.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import java.util.Map;
 
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelopes.java b/java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricEnvelopes.java
similarity index 95%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelopes.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricEnvelopes.java
index 4e3372e2..555ea3ff 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelopes.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricEnvelopes.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.hpcloud.util.Exceptions;
+import monasca.common.util.Exceptions;
 
 /**
  * Utilities for working with MetricEnvelopes.
diff --git a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/Metrics.java b/java/monasca-common-model/src/main/java/monasca/common/model/metric/Metrics.java
similarity index 97%
rename from java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/Metrics.java
rename to java/monasca-common-model/src/main/java/monasca/common/model/metric/Metrics.java
index 0bc6fb71..038fbc61 100644
--- a/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/Metrics.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/metric/Metrics.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import java.io.IOException;
 import java.util.Map;
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.hpcloud.util.Exceptions;
+import monasca.common.util.Exceptions;
 
 /**
  * Utilities for working with Metrics.
diff --git a/java/monasca-common-model/src/main/resources/com/hpcloud/mon/common/model/alarm/AlarmExpression.g4 b/java/monasca-common-model/src/main/resources/monasca/common/model/alarm/AlarmExpression.g4
similarity index 100%
rename from java/monasca-common-model/src/main/resources/com/hpcloud/mon/common/model/alarm/AlarmExpression.g4
rename to java/monasca-common-model/src/main/resources/monasca/common/model/alarm/AlarmExpression.g4
diff --git a/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/ServicesTest.java b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/ServicesTest.java
similarity index 87%
rename from java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/ServicesTest.java
rename to java/monasca-common-model/src/test/java/monasca/common/mon/common/model/ServicesTest.java
index 83f845a5..8ae35f12 100644
--- a/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/ServicesTest.java
+++ b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/ServicesTest.java
@@ -1,4 +1,4 @@
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import static org.testng.Assert.assertTrue;
 
diff --git a/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionTest.java b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmExpressionTest.java
similarity index 99%
rename from java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionTest.java
rename to java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmExpressionTest.java
index e32edf3f..110b244b 100644
--- a/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionTest.java
+++ b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmExpressionTest.java
@@ -1,4 +1,4 @@
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -10,7 +10,7 @@ import java.util.List;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableMap;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.metric.MetricDefinition;
 
 @Test
 public class AlarmExpressionTest {
diff --git a/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionTest.java b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmSubExpressionTest.java
similarity index 94%
rename from java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionTest.java
rename to java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmSubExpressionTest.java
index aa897ce0..175101dd 100644
--- a/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionTest.java
+++ b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmSubExpressionTest.java
@@ -1,4 +1,4 @@
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -7,11 +7,11 @@ import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableMap;
-import com.hpcloud.mon.common.model.alarm.AggregateFunction;
-import com.hpcloud.mon.common.model.alarm.AlarmExpression;
-import com.hpcloud.mon.common.model.alarm.AlarmOperator;
-import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.alarm.AggregateFunction;
+import monasca.common.model.alarm.AlarmExpression;
+import monasca.common.model.alarm.AlarmOperator;
+import monasca.common.model.alarm.AlarmSubExpression;
+import monasca.common.model.metric.MetricDefinition;
 
 @Test
 public class AlarmSubExpressionTest {
diff --git a/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/metric/MetricsTest.java b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/metric/MetricsTest.java
similarity index 96%
rename from java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/metric/MetricsTest.java
rename to java/monasca-common-model/src/test/java/monasca/common/mon/common/model/metric/MetricsTest.java
index 172b4ffc..ba8bb44b 100644
--- a/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/metric/MetricsTest.java
+++ b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/metric/MetricsTest.java
@@ -1,4 +1,4 @@
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import static org.testng.Assert.assertEquals;
 
@@ -8,8 +8,8 @@ import java.util.TreeMap;
 
 import org.testng.annotations.Test;
 
-import com.hpcloud.mon.common.model.metric.Metric;
-import com.hpcloud.mon.common.model.metric.Metrics;
+import monasca.common.model.metric.Metric;
+import monasca.common.model.metric.Metrics;
 
 @Test
 public class MetricsTest {
diff --git a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/AbstractPersistenceModule.java b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/AbstractPersistenceModule.java
similarity index 96%
rename from java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/AbstractPersistenceModule.java
rename to java/monasca-common-persistence/src/main/java/monasca/common/persistence/AbstractPersistenceModule.java
index 927c9cff..2bb16268 100644
--- a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/AbstractPersistenceModule.java
+++ b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/AbstractPersistenceModule.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import org.skife.jdbi.v2.DBI;
 
diff --git a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/BeanMapper.java b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/BeanMapper.java
similarity index 99%
rename from java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/BeanMapper.java
rename to java/monasca-common-persistence/src/main/java/monasca/common/persistence/BeanMapper.java
index 6b79bb72..cff3cc7d 100644
--- a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/BeanMapper.java
+++ b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/BeanMapper.java
@@ -1,4 +1,4 @@
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 /*
  * Copyright 2004 - 2011 Brian McCallister
diff --git a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/BeanMapperFactory.java b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/BeanMapperFactory.java
similarity index 96%
rename from java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/BeanMapperFactory.java
rename to java/monasca-common-persistence/src/main/java/monasca/common/persistence/BeanMapperFactory.java
index 2c960599..f825ee20 100644
--- a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/BeanMapperFactory.java
+++ b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/BeanMapperFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import org.skife.jdbi.v2.ResultSetMapperFactory;
 import org.skife.jdbi.v2.StatementContext;
@@ -34,4 +34,4 @@ public class BeanMapperFactory implements ResultSetMapperFactory {
   public ResultSetMapper mapperFor(Class type, StatementContext ctx) {
     return new BeanMapper(type);
   }
-}
\ No newline at end of file
+}
diff --git a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/DataTypes.java b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/DataTypes.java
similarity index 97%
rename from java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/DataTypes.java
rename to java/monasca-common-persistence/src/main/java/monasca/common/persistence/DataTypes.java
index 99559597..552ce52a 100644
--- a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/DataTypes.java
+++ b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/DataTypes.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import java.io.Reader;
 import java.sql.Clob;
diff --git a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/KeyValueMapper.java b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/KeyValueMapper.java
similarity index 97%
rename from java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/KeyValueMapper.java
rename to java/monasca-common-persistence/src/main/java/monasca/common/persistence/KeyValueMapper.java
index 7584003c..96b3bc4f 100644
--- a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/KeyValueMapper.java
+++ b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/KeyValueMapper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/SqlQueries.java b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/SqlQueries.java
similarity index 97%
rename from java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/SqlQueries.java
rename to java/monasca-common-persistence/src/main/java/monasca/common/persistence/SqlQueries.java
index df1c3c93..e6a094d1 100644
--- a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/SqlQueries.java
+++ b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/SqlQueries.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import java.util.Iterator;
 import java.util.Map;
diff --git a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/SqlStatements.java b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/SqlStatements.java
similarity index 98%
rename from java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/SqlStatements.java
rename to java/monasca-common-persistence/src/main/java/monasca/common/persistence/SqlStatements.java
index 528f5ed0..4ee4a4cc 100644
--- a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/SqlStatements.java
+++ b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/SqlStatements.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import java.util.List;
 import java.util.Map;
diff --git a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/package-info.java b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/package-info.java
similarity index 52%
rename from java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/package-info.java
rename to java/monasca-common-persistence/src/main/java/monasca/common/persistence/package-info.java
index 047b9000..03b04e08 100644
--- a/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/package-info.java
+++ b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/package-info.java
@@ -1,5 +1,5 @@
 /**
  * Persistence related types.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
diff --git a/java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/AbstractPersistenceModuleTest.java b/java/monasca-common-persistence/src/test/java/monasca/common/persistence/AbstractPersistenceModuleTest.java
similarity index 96%
rename from java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/AbstractPersistenceModuleTest.java
rename to java/monasca-common-persistence/src/test/java/monasca/common/persistence/AbstractPersistenceModuleTest.java
index 27ee8ab1..918cc8e0 100644
--- a/java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/AbstractPersistenceModuleTest.java
+++ b/java/monasca-common-persistence/src/test/java/monasca/common/persistence/AbstractPersistenceModuleTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -26,7 +26,7 @@ import org.testng.annotations.Test;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;
-import com.hpcloud.util.Injector;
+import monasca.common.util.Injector;
 
 @Test
 public class AbstractPersistenceModuleTest {
diff --git a/java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/BeanMappeTest.java b/java/monasca-common-persistence/src/test/java/monasca/common/persistence/BeanMappeTest.java
similarity index 96%
rename from java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/BeanMappeTest.java
rename to java/monasca-common-persistence/src/test/java/monasca/common/persistence/BeanMappeTest.java
index c0a4d360..c6d50e37 100644
--- a/java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/BeanMappeTest.java
+++ b/java/monasca-common-persistence/src/test/java/monasca/common/persistence/BeanMappeTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import static org.testng.Assert.*;
 import org.testng.annotations.Test;
diff --git a/java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/SqlStatementsTest.java b/java/monasca-common-persistence/src/test/java/monasca/common/persistence/SqlStatementsTest.java
similarity index 97%
rename from java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/SqlStatementsTest.java
rename to java/monasca-common-persistence/src/test/java/monasca/common/persistence/SqlStatementsTest.java
index 6e2dbb84..5c253cfd 100644
--- a/java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/SqlStatementsTest.java
+++ b/java/monasca-common-persistence/src/test/java/monasca/common/persistence/SqlStatementsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Logging.java b/java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Logging.java
similarity index 95%
rename from java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Logging.java
rename to java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Logging.java
index af65182d..a96f2da0 100644
--- a/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Logging.java
+++ b/java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Logging.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import backtype.storm.task.TopologyContext;
 
diff --git a/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Streams.java b/java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Streams.java
similarity index 95%
rename from java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Streams.java
rename to java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Streams.java
index fcf9f6e5..ebc6c963 100644
--- a/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Streams.java
+++ b/java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Streams.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 /**
  * Utilities for working with streams.
diff --git a/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/TupleDeserializer.java b/java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/TupleDeserializer.java
similarity index 96%
rename from java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/TupleDeserializer.java
rename to java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/TupleDeserializer.java
index c6d31e8e..abc19086 100644
--- a/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/TupleDeserializer.java
+++ b/java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/TupleDeserializer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import java.util.List;
 
diff --git a/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Tuples.java b/java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Tuples.java
similarity index 96%
rename from java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Tuples.java
rename to java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Tuples.java
index 58af53cb..c7c46796 100644
--- a/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Tuples.java
+++ b/java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Tuples.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import backtype.storm.Constants;
 import backtype.storm.tuple.Tuple;
diff --git a/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/NoopSpout.java b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/NoopSpout.java
similarity index 95%
rename from java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/NoopSpout.java
rename to java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/NoopSpout.java
index a2bb377b..e0539242 100644
--- a/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/NoopSpout.java
+++ b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/NoopSpout.java
@@ -1,4 +1,4 @@
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import java.util.Map;
 
diff --git a/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/PeriodicTupleProvider.java b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/PeriodicTupleProvider.java
similarity index 59%
rename from java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/PeriodicTupleProvider.java
rename to java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/PeriodicTupleProvider.java
index 5c1f935d..1d67bce9 100644
--- a/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/PeriodicTupleProvider.java
+++ b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/PeriodicTupleProvider.java
@@ -1,8 +1,8 @@
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import java.util.List;
 
-import com.hpcloud.streaming.storm.TestSpout.TupleProvider;
+import monasca.common.streaming.storm.TestSpout.TupleProvider;
 
 public class PeriodicTupleProvider implements TupleProvider {
   @Override
diff --git a/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/TestSpout.java b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TestSpout.java
similarity index 92%
rename from java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/TestSpout.java
rename to java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TestSpout.java
index 108e1e81..8319a0af 100644
--- a/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/TestSpout.java
+++ b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TestSpout.java
@@ -1,4 +1,4 @@
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import java.util.List;
 import java.util.Map;
@@ -8,7 +8,7 @@ import backtype.storm.task.TopologyContext;
 import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichSpout;
 
-import com.hpcloud.streaming.storm.TupleDeserializer;
+import monasca.common.streaming.storm.TupleDeserializer;
 
 public class TestSpout extends BaseRichSpout {
   private static final long serialVersionUID = 849564133745588803L;
diff --git a/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/TopologyTestCase.java b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TopologyTestCase.java
similarity index 94%
rename from java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/TopologyTestCase.java
rename to java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TopologyTestCase.java
index bb8dea4c..62fb02e2 100644
--- a/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/TopologyTestCase.java
+++ b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TopologyTestCase.java
@@ -1,4 +1,4 @@
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
@@ -9,7 +9,7 @@ import backtype.storm.LocalCluster;
 import backtype.storm.generated.StormTopology;
 
 import com.google.common.base.Preconditions;
-import com.hpcloud.util.Injector;
+import monasca.common.util.Injector;
 
 @Test(groups = "integration")
 public class TopologyTestCase {
diff --git a/java/monasca-common-testing/src/main/java/com/hpcloud/testing/Assert.java b/java/monasca-common-testing/src/main/java/monasca/common/testing/Assert.java
similarity index 98%
rename from java/monasca-common-testing/src/main/java/com/hpcloud/testing/Assert.java
rename to java/monasca-common-testing/src/main/java/monasca/common/testing/Assert.java
index e871c1c8..023c0920 100644
--- a/java/monasca-common-testing/src/main/java/com/hpcloud/testing/Assert.java
+++ b/java/monasca-common-testing/src/main/java/monasca/common/testing/Assert.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.testing;
+package monasca.common.testing;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
diff --git a/java/monasca-common-testing/src/main/resources/testngAll.xml b/java/monasca-common-testing/src/main/resources/testngAll.xml
index 315fd46a..fabade53 100644
--- a/java/monasca-common-testing/src/main/resources/testngAll.xml
+++ b/java/monasca-common-testing/src/main/resources/testngAll.xml
@@ -11,11 +11,11 @@
       </run>
     </groups>
     <packages>
-      <package name="com.hpcloud.*" />
+      <package name="monasca.*" />
     </packages>
   </test>
 
   <listeners>
-    <!-- <listener class-name="com.hpcloud.LoggingListener" /> -->
+    <!-- <listener class-name="monasca.LoggingListener" /> -->
   </listeners>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/java/monasca-common-testing/src/test/resources/com/hpcloud/test-config.yml b/java/monasca-common-testing/src/test/resources/monasca/common/test-config.yml
similarity index 100%
rename from java/monasca-common-testing/src/test/resources/com/hpcloud/test-config.yml
rename to java/monasca-common-testing/src/test/resources/monasca/common/test-config.yml
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/Duration.java b/java/monasca-common-util/src/main/java/monasca/common/util/Duration.java
similarity index 99%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/Duration.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/Duration.java
index c2c40680..d531a1ff 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/Duration.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/Duration.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/Exceptions.java b/java/monasca-common-util/src/main/java/monasca/common/util/Exceptions.java
similarity index 98%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/Exceptions.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/Exceptions.java
index 2b01f216..cfbccfa9 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/Exceptions.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/Exceptions.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import com.google.common.base.Preconditions;
 
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/Injector.java b/java/monasca-common-util/src/main/java/monasca/common/util/Injector.java
similarity index 99%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/Injector.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/Injector.java
index 5d344b1a..9ced4945 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/Injector.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/Injector.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.ConfigurationException;
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/Serialization.java b/java/monasca-common-util/src/main/java/monasca/common/util/Serialization.java
similarity index 99%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/Serialization.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/Serialization.java
index e6d74d53..0bc1c553 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/Serialization.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/Serialization.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import java.io.IOException;
 import java.util.Map;
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/Stack.java b/java/monasca-common-util/src/main/java/monasca/common/util/Stack.java
similarity index 94%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/Stack.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/Stack.java
index 90a9ae0f..2ff38530 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/Stack.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/Stack.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import java.util.ArrayList;
 
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/Types.java b/java/monasca-common-util/src/main/java/monasca/common/util/Types.java
similarity index 98%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/Types.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/Types.java
index 704f9154..8de2b7d9 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/Types.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/Types.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import java.lang.reflect.Method;
 
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/ExecutionListener.java b/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/ExecutionListener.java
similarity index 95%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/ExecutionListener.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/concurrent/ExecutionListener.java
index b83affe7..fffa2cfe 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/ExecutionListener.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/ExecutionListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.concurrent;
+package monasca.common.util.concurrent;
 
 /**
  * Listens to execution related events.
@@ -23,4 +23,4 @@ public interface ExecutionListener {
   void afterExecute(Runnable r, Throwable t);
 
   void beforeExecute(Thread t, Runnable r);
-}
\ No newline at end of file
+}
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/InstrumentedThreadPoolExecutor.java b/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/InstrumentedThreadPoolExecutor.java
similarity index 99%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/InstrumentedThreadPoolExecutor.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/concurrent/InstrumentedThreadPoolExecutor.java
index 50c66aa6..9cb9d168 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/InstrumentedThreadPoolExecutor.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/InstrumentedThreadPoolExecutor.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.concurrent;
+package monasca.common.util.concurrent;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/ThreadPools.java b/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/ThreadPools.java
similarity index 98%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/ThreadPools.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/concurrent/ThreadPools.java
index ba592507..4127b284 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/ThreadPools.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/ThreadPools.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.concurrent;
+package monasca.common.util.concurrent;
 
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.SynchronousQueue;
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/package-info.java b/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/package-info.java
similarity index 55%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/package-info.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/concurrent/package-info.java
index ab5389b9..ee348398 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/package-info.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/package-info.java
@@ -1,5 +1,5 @@
 /**
  * Utilities for concurrent processing.
  */
-package com.hpcloud.util.concurrent;
+package monasca.common.util.concurrent;
 
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/config/ConfigurationException.java b/java/monasca-common-util/src/main/java/monasca/common/util/config/ConfigurationException.java
similarity index 97%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/config/ConfigurationException.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/config/ConfigurationException.java
index 6b71f22c..2da58b8a 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/config/ConfigurationException.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/config/ConfigurationException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.config;
+package monasca.common.util.config;
 
 /**
  * An exception thrown where there is an error parsing a configuration object.
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/config/ConfigurationFactory.java b/java/monasca-common-util/src/main/java/monasca/common/util/config/ConfigurationFactory.java
similarity index 96%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/config/ConfigurationFactory.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/config/ConfigurationFactory.java
index b0b9c12c..9168324c 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/config/ConfigurationFactory.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/config/ConfigurationFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.config;
+package monasca.common.util.config;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.TreeTraversingParser;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.google.common.collect.ImmutableList;
-import com.hpcloud.util.validation.Validator;
+import monasca.common.util.validation.Validator;
 
 /**
  * Adapted from Dropwizard.
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/config/Configurations.java b/java/monasca-common-util/src/main/java/monasca/common/util/config/Configurations.java
similarity index 98%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/config/Configurations.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/config/Configurations.java
index 5d211f4f..454d5432 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/config/Configurations.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/config/Configurations.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.config;
+package monasca.common.util.config;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/stats/SlidingWindowStats.java b/java/monasca-common-util/src/main/java/monasca/common/util/stats/SlidingWindowStats.java
similarity index 98%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/stats/SlidingWindowStats.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/stats/SlidingWindowStats.java
index 8ae9ba1a..4461a45b 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/stats/SlidingWindowStats.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/stats/SlidingWindowStats.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.stats;
+package monasca.common.util.stats;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
-import com.hpcloud.util.Exceptions;
-import com.hpcloud.util.time.TimeResolution;
+import monasca.common.util.Exceptions;
+import monasca.common.util.time.TimeResolution;
 
 /**
  * A time based sliding window containing statistics for a fixed number of slots of a fixed length.
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/stats/Statistic.java b/java/monasca-common-util/src/main/java/monasca/common/util/stats/Statistic.java
similarity index 96%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/stats/Statistic.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/stats/Statistic.java
index 8b758257..8769d894 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/stats/Statistic.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/stats/Statistic.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.stats;
+package monasca.common.util.stats;
 
 /**
  * Statistic.
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/stats/Statistics.java b/java/monasca-common-util/src/main/java/monasca/common/util/stats/Statistics.java
similarity index 98%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/stats/Statistics.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/stats/Statistics.java
index f2873bc5..ec7aa650 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/stats/Statistics.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/stats/Statistics.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.stats;
+package monasca.common.util.stats;
 
 /**
  * Statistic implementations.
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/time/TimeResolution.java b/java/monasca-common-util/src/main/java/monasca/common/util/time/TimeResolution.java
similarity index 97%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/time/TimeResolution.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/time/TimeResolution.java
index eda112b8..8e4373b6 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/time/TimeResolution.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/time/TimeResolution.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.time;
+package monasca.common.util.time;
 
 /**
  * Time resolution.
@@ -43,4 +43,4 @@ public enum TimeResolution {
    * Returns the {@code timestamp} adjusted for the resolution.
    */
   public abstract long adjust(long timestamp);
-}
\ No newline at end of file
+}
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/time/Times.java b/java/monasca-common-util/src/main/java/monasca/common/util/time/Times.java
similarity index 97%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/time/Times.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/time/Times.java
index 2dd0664e..21eae51b 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/time/Times.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/time/Times.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.time;
+package monasca.common.util.time;
 
 /**
  * Utilities for working with times.
diff --git a/java/monasca-common-util/src/main/java/com/hpcloud/util/validation/Validator.java b/java/monasca-common-util/src/main/java/monasca/common/util/validation/Validator.java
similarity index 97%
rename from java/monasca-common-util/src/main/java/com/hpcloud/util/validation/Validator.java
rename to java/monasca-common-util/src/main/java/monasca/common/util/validation/Validator.java
index d2f26cfe..40f5414c 100644
--- a/java/monasca-common-util/src/main/java/com/hpcloud/util/validation/Validator.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/validation/Validator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.validation;
+package monasca.common.util.validation;
 
 import static java.lang.String.format;
 
diff --git a/java/monasca-common-util/src/test/java/com/hpcloud/util/DurationTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/DurationTest.java
similarity index 97%
rename from java/monasca-common-util/src/test/java/com/hpcloud/util/DurationTest.java
rename to java/monasca-common-util/src/test/java/monasca/common/util/DurationTest.java
index e6eac281..a1b600da 100644
--- a/java/monasca-common-util/src/test/java/com/hpcloud/util/DurationTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/DurationTest.java
@@ -1,4 +1,4 @@
-package com.hpcloud.util;
+package monasca.common.util;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
diff --git a/java/monasca-common-util/src/test/java/com/hpcloud/util/SerializationTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/SerializationTest.java
similarity index 99%
rename from java/monasca-common-util/src/test/java/com/hpcloud/util/SerializationTest.java
rename to java/monasca-common-util/src/test/java/monasca/common/util/SerializationTest.java
index 9d53979f..598f4e8f 100644
--- a/java/monasca-common-util/src/test/java/com/hpcloud/util/SerializationTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/SerializationTest.java
@@ -1,4 +1,4 @@
-package com.hpcloud.util;
+package monasca.common.util;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
diff --git a/java/monasca-common-util/src/test/java/com/hpcloud/util/TypesTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/TypesTest.java
similarity index 98%
rename from java/monasca-common-util/src/test/java/com/hpcloud/util/TypesTest.java
rename to java/monasca-common-util/src/test/java/monasca/common/util/TypesTest.java
index 25ba80eb..b603a4b6 100644
--- a/java/monasca-common-util/src/test/java/com/hpcloud/util/TypesTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/TypesTest.java
@@ -1,4 +1,4 @@
-package com.hpcloud.util;
+package monasca.common.util;
 
 import static com.google.inject.matcher.Matchers.any;
 import static org.testng.Assert.assertEquals;
@@ -56,4 +56,4 @@ public class TypesTest {
 
     assertEquals(Types.deProxy(proxy), ArrayList.class);
   }
-}
\ No newline at end of file
+}
diff --git a/java/monasca-common-util/src/test/java/com/hpcloud/util/stats/SlidingWindowStatsTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/stats/SlidingWindowStatsTest.java
similarity index 98%
rename from java/monasca-common-util/src/test/java/com/hpcloud/util/stats/SlidingWindowStatsTest.java
rename to java/monasca-common-util/src/test/java/monasca/common/util/stats/SlidingWindowStatsTest.java
index bddd963a..aebecebe 100644
--- a/java/monasca-common-util/src/test/java/com/hpcloud/util/stats/SlidingWindowStatsTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/stats/SlidingWindowStatsTest.java
@@ -1,12 +1,12 @@
-package com.hpcloud.util.stats;
+package monasca.common.util.stats;
 
-import static com.hpcloud.testing.Assert.assertArraysEqual;
+import static monasca.common.testing.Assert.assertArraysEqual;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 
 import org.testng.annotations.Test;
 
-import com.hpcloud.util.time.TimeResolution;
+import monasca.common.util.time.TimeResolution;
 
 @Test
 public class SlidingWindowStatsTest {
diff --git a/java/monasca-common-util/src/test/java/com/hpcloud/util/stats/StatisticsTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/stats/StatisticsTest.java
similarity index 67%
rename from java/monasca-common-util/src/test/java/com/hpcloud/util/stats/StatisticsTest.java
rename to java/monasca-common-util/src/test/java/monasca/common/util/stats/StatisticsTest.java
index 39157b75..8721d891 100644
--- a/java/monasca-common-util/src/test/java/com/hpcloud/util/stats/StatisticsTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/stats/StatisticsTest.java
@@ -1,15 +1,15 @@
-package com.hpcloud.util.stats;
+package monasca.common.util.stats;
 
 import static org.testng.Assert.assertEquals;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import com.hpcloud.util.stats.Statistics.Average;
-import com.hpcloud.util.stats.Statistics.Count;
-import com.hpcloud.util.stats.Statistics.Max;
-import com.hpcloud.util.stats.Statistics.Min;
-import com.hpcloud.util.stats.Statistics.Sum;
+import monasca.common.util.stats.Statistics.Average;
+import monasca.common.util.stats.Statistics.Count;
+import monasca.common.util.stats.Statistics.Max;
+import monasca.common.util.stats.Statistics.Min;
+import monasca.common.util.stats.Statistics.Sum;
 
 @Test
 public class StatisticsTest {
diff --git a/java/monasca-common-util/src/test/java/com/hpcloud/util/time/TimesTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/time/TimesTest.java
similarity index 97%
rename from java/monasca-common-util/src/test/java/com/hpcloud/util/time/TimesTest.java
rename to java/monasca-common-util/src/test/java/monasca/common/util/time/TimesTest.java
index 260a61fe..e3fbf519 100644
--- a/java/monasca-common-util/src/test/java/com/hpcloud/util/time/TimesTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/time/TimesTest.java
@@ -1,4 +1,4 @@
-package com.hpcloud.util.time;
+package monasca.common.util.time;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/pom.xml b/pom.xml
index 60b3a5dc..ee45c735 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,8 +2,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.hpcloud</groupId>
-  <artifactId>mon-common</artifactId>
+  <groupId>monasca</groupId>
+  <artifactId>monasca-common</artifactId>
   <version>1.0.0</version>
   <url>http://github.com/stackforge/monasca-common</url>
   <packaging>pom</packaging>