diff --git a/modules/samples/connectedcup/component/connected-cup-agent/pom.xml b/modules/samples/connectedcup/component/agent/pom.xml
similarity index 98%
rename from modules/samples/connectedcup/component/connected-cup-agent/pom.xml
rename to modules/samples/connectedcup/component/agent/pom.xml
index a2415794..e3308618 100644
--- a/modules/samples/connectedcup/component/connected-cup-agent/pom.xml
+++ b/modules/samples/connectedcup/component/agent/pom.xml
@@ -7,7 +7,7 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.coffeking.agent</artifactId>
+  <artifactId>org.coffeeking.agent</artifactId>
   <packaging>war</packaging>
   <version>1.9.2-SNAPSHOT</version>
   <name>connected-cup-agent Maven Webapp</name>
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java
rename to modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java
rename to modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java
rename to modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java
rename to modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java
rename to modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java
rename to modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/WEB-INF/web.xml b/modules/samples/connectedcup/component/agent/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/WEB-INF/web.xml
rename to modules/samples/connectedcup/component/agent/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/bootstrap.min.css b/modules/samples/connectedcup/component/agent/src/main/webapp/bootstrap.min.css
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/bootstrap.min.css
rename to modules/samples/connectedcup/component/agent/src/main/webapp/bootstrap.min.css
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/coffeecup.png b/modules/samples/connectedcup/component/agent/src/main/webapp/coffeecup.png
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/coffeecup.png
rename to modules/samples/connectedcup/component/agent/src/main/webapp/coffeecup.png
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/css/bootstrap.min.css b/modules/samples/connectedcup/component/agent/src/main/webapp/css/bootstrap.min.css
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/css/bootstrap.min.css
rename to modules/samples/connectedcup/component/agent/src/main/webapp/css/bootstrap.min.css
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/css/jquery-ui.css b/modules/samples/connectedcup/component/agent/src/main/webapp/css/jquery-ui.css
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/css/jquery-ui.css
rename to modules/samples/connectedcup/component/agent/src/main/webapp/css/jquery-ui.css
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/images/coffeecup.png b/modules/samples/connectedcup/component/agent/src/main/webapp/images/coffeecup.png
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/images/coffeecup.png
rename to modules/samples/connectedcup/component/agent/src/main/webapp/images/coffeecup.png
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/index.jsp b/modules/samples/connectedcup/component/agent/src/main/webapp/index.jsp
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/index.jsp
rename to modules/samples/connectedcup/component/agent/src/main/webapp/index.jsp
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/jquery-1.12.0.min.js b/modules/samples/connectedcup/component/agent/src/main/webapp/jquery-1.12.0.min.js
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/jquery-1.12.0.min.js
rename to modules/samples/connectedcup/component/agent/src/main/webapp/jquery-1.12.0.min.js
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/jquery-ui.css b/modules/samples/connectedcup/component/agent/src/main/webapp/jquery-ui.css
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/jquery-ui.css
rename to modules/samples/connectedcup/component/agent/src/main/webapp/jquery-ui.css
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/jquery-ui.js b/modules/samples/connectedcup/component/agent/src/main/webapp/jquery-ui.js
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/jquery-ui.js
rename to modules/samples/connectedcup/component/agent/src/main/webapp/jquery-ui.js
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/js/libs/jquery-1.12.0.min.js b/modules/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery-1.12.0.min.js
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/js/libs/jquery-1.12.0.min.js
rename to modules/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery-1.12.0.min.js
diff --git a/modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/js/libs/jquery-ui.js b/modules/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery-ui.js
similarity index 100%
rename from modules/samples/connectedcup/component/connected-cup-agent/src/main/webapp/js/libs/jquery-ui.js
rename to modules/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery-ui.js
diff --git a/modules/samples/connectedcup/component/pom.xml b/modules/samples/connectedcup/component/pom.xml
index 45869d0a..f32b6827 100644
--- a/modules/samples/connectedcup/component/pom.xml
+++ b/modules/samples/connectedcup/component/pom.xml
@@ -40,6 +40,7 @@
 		<module>plugin</module>
 		<module>controller</module>
 		<module>manager</module>
+        <module>agent</module>
 
 	</modules>