diff --git a/prototype/src/main/java/org/hso/ecommerce/api/RestServiceForDelivery.java b/prototype/src/main/java/org/hso/ecommerce/api/RestServiceForDelivery.java
index 7d4c813..573eb42 100644
--- a/prototype/src/main/java/org/hso/ecommerce/api/RestServiceForDelivery.java
+++ b/prototype/src/main/java/org/hso/ecommerce/api/RestServiceForDelivery.java
@@ -1,7 +1,7 @@
 package org.hso.ecommerce.api;
 
 import org.hso.ecommerce.entities.shop.CustomerOrder;
-import org.hso.ecommerce.uiModel.DeliveryData;
+import org.hso.ecommerce.uimodel.DeliveryData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.*;
diff --git a/prototype/src/main/java/org/hso/ecommerce/app/Application.java b/prototype/src/main/java/org/hso/ecommerce/app/Application.java
index ef719c7..a3decbb 100644
--- a/prototype/src/main/java/org/hso/ecommerce/app/Application.java
+++ b/prototype/src/main/java/org/hso/ecommerce/app/Application.java
@@ -3,12 +3,9 @@ package org.hso.ecommerce.app;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
-import java.util.Arrays;
-
 @SpringBootApplication
 @ComponentScan(basePackages = {"org.hso.ecommerce"})
 @EntityScan("org.hso.ecommerce")
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java b/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
index 1928c1b..1b493dd 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
@@ -6,7 +6,7 @@ import org.hso.ecommerce.entities.shop.CustomerOrder;
 import org.hso.ecommerce.entities.user.User;
 import org.hso.ecommerce.repos.shop.CustomerOrderRepository;
 import org.hso.ecommerce.repos.user.UserRepository;
-import org.hso.ecommerce.uiModel.DeliveryData;
+import org.hso.ecommerce.uimodel.DeliveryData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -53,13 +53,12 @@ public class UserController {
 
     @GetMapping("/orders/")
     public String userOrders(HttpSession session,
-                              Model model
+                             Model model
     ) {
-        List<CustomerOrder> orders =  customerOrderRepository.getAllOrders();
+        List<CustomerOrder> orders = customerOrderRepository.getAllOrders();
 
-        Map<CustomerOrder, DeliveryData> customerOrderDeliveryDataMap = orders.stream().collect
-                (Collectors.toMap
-                        (Function.identity(), c -> DeliveryData.getDeliveryDataFromCustomerOrder(c,customerOrderRepository, restServiceForDelivery)));
+        Map<CustomerOrder, DeliveryData> customerOrderDeliveryDataMap = orders.stream().
+                collect(Collectors.toMap(Function.identity(), c -> DeliveryData.getDeliveryDataFromCustomerOrder(c, customerOrderRepository, restServiceForDelivery)));
 
         model.addAttribute("orderDeliveryDataMap", customerOrderDeliveryDataMap);
 
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/CustomerOrderController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/CustomerOrderController.java
index 4c25dbe..8a5087e 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/CustomerOrderController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/CustomerOrderController.java
@@ -3,7 +3,7 @@ package org.hso.ecommerce.controller.intern.customers;
 import org.hso.ecommerce.api.RestServiceForDelivery;
 import org.hso.ecommerce.entities.shop.CustomerOrder;
 import org.hso.ecommerce.repos.shop.CustomerOrderRepository;
-import org.hso.ecommerce.uiModel.DeliveryData;
+import org.hso.ecommerce.uimodel.DeliveryData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/prototype/src/main/java/org/hso/ecommerce/repos/user/UserRepository.java b/prototype/src/main/java/org/hso/ecommerce/repos/user/UserRepository.java
index 7c99c71..8b34eea 100644
--- a/prototype/src/main/java/org/hso/ecommerce/repos/user/UserRepository.java
+++ b/prototype/src/main/java/org/hso/ecommerce/repos/user/UserRepository.java
@@ -2,14 +2,11 @@ package org.hso.ecommerce.repos.user;
 
 import org.hso.ecommerce.entities.user.User;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
 
-import static jdk.nashorn.internal.runtime.regexp.joni.Syntax.Java;
-
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
 
diff --git a/prototype/src/main/java/org/hso/ecommerce/uiModel/DeliveryData.java b/prototype/src/main/java/org/hso/ecommerce/uimodel/DeliveryData.java
similarity index 98%
rename from prototype/src/main/java/org/hso/ecommerce/uiModel/DeliveryData.java
rename to prototype/src/main/java/org/hso/ecommerce/uimodel/DeliveryData.java
index c90ff3b..fd8b176 100644
--- a/prototype/src/main/java/org/hso/ecommerce/uiModel/DeliveryData.java
+++ b/prototype/src/main/java/org/hso/ecommerce/uimodel/DeliveryData.java
@@ -1,4 +1,4 @@
-package org.hso.ecommerce.uiModel;
+package org.hso.ecommerce.uimodel;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import org.hso.ecommerce.api.RestServiceForDelivery;