diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/ArticleController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java
similarity index 52%
rename from prototype/src/main/java/org/hso/ecommerce/controller/ArticleController.java
rename to prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java
index 5433d25..d078f54 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/ArticleController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java
@@ -1,8 +1,8 @@
-package org.hso.ecommerce.controller;
+package org.hso.ecommerce.controller.intern;
 
 import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class ArticleController {
+public class InternArticleController {
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/IndexController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/InternIndexController.java
similarity index 78%
rename from prototype/src/main/java/org/hso/ecommerce/controller/intern/IndexController.java
rename to prototype/src/main/java/org/hso/ecommerce/controller/intern/InternIndexController.java
index 32ee4a7..65b3dba 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/IndexController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/InternIndexController.java
@@ -4,5 +4,5 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class IndexController {
+public class InternIndexController {
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/IndexController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/CustomerOrderController.java
similarity index 78%
rename from prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/IndexController.java
rename to prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/CustomerOrderController.java
index ee07280..1cea63e 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/IndexController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/CustomerOrderController.java
@@ -4,5 +4,5 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class IndexController {
+public class CustomerOrderController {
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/OrderController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/CustomersIndexController.java
similarity index 78%
rename from prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/OrderController.java
rename to prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/CustomersIndexController.java
index 19db2a9..a15b927 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/OrderController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/CustomersIndexController.java
@@ -4,5 +4,5 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class OrderController {
+public class CustomersIndexController {
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/IndexController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierIndexController.java
similarity index 78%
rename from prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/IndexController.java
rename to prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierIndexController.java
index c9ad42b..d6cefc0 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/IndexController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierIndexController.java
@@ -4,5 +4,5 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class IndexController {
+public class SupplierIndexController {
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OfferController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java
similarity index 78%
rename from prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OfferController.java
rename to prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java
index a7932b5..ec6dfbf 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OfferController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java
@@ -4,5 +4,5 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class OfferController {
+public class SupplierOfferController {
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OrderController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOrderController.java
similarity index 78%
rename from prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OrderController.java
rename to prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOrderController.java
index aa63fcd..ef3acb4 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OrderController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOrderController.java
@@ -4,5 +4,5 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class OrderController {
+public class SupplierOrderController {
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/shop/ArticleController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopArticleController.java
similarity index 78%
rename from prototype/src/main/java/org/hso/ecommerce/controller/shop/ArticleController.java
rename to prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopArticleController.java
index 5e17f90..27ccf63 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/shop/ArticleController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopArticleController.java
@@ -4,5 +4,5 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class ArticleController {
+public class ShopArticleController {
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/shop/CheckoutController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopCheckoutController.java
similarity index 77%
rename from prototype/src/main/java/org/hso/ecommerce/controller/shop/CheckoutController.java
rename to prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopCheckoutController.java
index 13f3dda..dd127da 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/shop/CheckoutController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopCheckoutController.java
@@ -4,5 +4,5 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class CheckoutController {
+public class ShopCheckoutController {
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/shop/IndexController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopIndexController.java
similarity index 79%
rename from prototype/src/main/java/org/hso/ecommerce/controller/shop/IndexController.java
rename to prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopIndexController.java
index 378efa1..0f423db 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/shop/IndexController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopIndexController.java
@@ -4,5 +4,5 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class IndexController {
+public class ShopIndexController {
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/shop/SearchController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java
similarity index 78%
rename from prototype/src/main/java/org/hso/ecommerce/controller/shop/SearchController.java
rename to prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java
index 29d47d7..05a795f 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/shop/SearchController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java
@@ -4,5 +4,5 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class SearchController {
+public class ShopSearchController {
 }