diff --git a/pom.xml b/pom.xml
index 8ec48f7..9ff57f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
                         <manifest>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>${project.build.directory}/lib/</classpathPrefix>
-                            <mainClass>com.cloudius.main.Main</mainClass>
+                            <mainClass>com.cloudius.urchin.main.Main</mainClass>
                         </manifest>
                     </archive>
                 </configuration>
diff --git a/src/main/java/com/cloudius/api/APIClient.java b/src/main/java/com/cloudius/urchin/api/APIClient.java
similarity index 99%
rename from src/main/java/com/cloudius/api/APIClient.java
rename to src/main/java/com/cloudius/urchin/api/APIClient.java
index 952e4d7..9537f5e 100644
--- a/src/main/java/com/cloudius/api/APIClient.java
+++ b/src/main/java/com/cloudius/urchin/api/APIClient.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2015 Cloudius Systems
  */
-package com.cloudius.api;
+package com.cloudius.urchin.api;
 
 import java.io.StringReader;
 import java.net.InetAddress;
diff --git a/src/main/java/com/cloudius/main/Main.java b/src/main/java/com/cloudius/urchin/main/Main.java
similarity index 86%
rename from src/main/java/com/cloudius/main/Main.java
rename to src/main/java/com/cloudius/urchin/main/Main.java
index 1b4994d..aecc14e 100644
--- a/src/main/java/com/cloudius/main/Main.java
+++ b/src/main/java/com/cloudius/urchin/main/Main.java
@@ -1,9 +1,9 @@
 /*
  * Copyright 2015 Cloudius Systems
  */
-package com.cloudius.main;
+package com.cloudius.urchin.main;
 
-import com.cloudius.api.APIClient;
+import com.cloudius.urchin.api.APIClient;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.StorageService;
 
diff --git a/src/main/java/org/apache/cassandra/net/MessagingService.java b/src/main/java/org/apache/cassandra/net/MessagingService.java
index e758487..0278bf7 100644
--- a/src/main/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/main/java/org/apache/cassandra/net/MessagingService.java
@@ -29,7 +29,7 @@ import java.util.*;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import com.cloudius.api.APIClient;
+import com.cloudius.urchin.api.APIClient;
 
 public final class MessagingService implements MessagingServiceMBean {
     public static final String MBEAN_NAME = "org.apache.cassandra.net:type=MessagingService";
diff --git a/src/main/java/org/apache/cassandra/service/StorageService.java b/src/main/java/org/apache/cassandra/service/StorageService.java
index 1aa97da..7ed2131 100644
--- a/src/main/java/org/apache/cassandra/service/StorageService.java
+++ b/src/main/java/org/apache/cassandra/service/StorageService.java
@@ -35,7 +35,7 @@ import javax.management.openmbean.TabularData;
 
 import org.apache.cassandra.repair.RepairParallelism;
 
-import com.cloudius.api.APIClient;
+import com.cloudius.urchin.api.APIClient;
 
 /**
  * This abstraction contains the token/identifier of this node on the identifier