diff --git a/pom.xml b/pom.xml
index 477aece277e070781245de137cdca9d122d39005..061bb1d462378ca1c050f2d957a310c3d5808ce1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,11 +8,11 @@
 		<version>2.5.6</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>de.hft-stuttgart</groupId>
-	<artifactId>middleware</artifactId>
+	<groupId>de.kebidge.middleware</groupId>
+	<artifactId>shopping-app</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>middleware</name>
-	<description>Demo project for Spring Boot</description>
+	<name>ShoppingApp</name>
+	<description>Shopping List Application</description>
 	<properties>
 		<java.version>11</java.version>
 	</properties>
diff --git a/src/main/java/de/hftstuttgart/middleware/MiddlewareApplication.java b/src/main/java/de/hftstuttgart/middleware/MiddlewareApplication.java
deleted file mode 100644
index 1c783c20feb9dd20488382bc78a64e0b12a2be72..0000000000000000000000000000000000000000
--- a/src/main/java/de/hftstuttgart/middleware/MiddlewareApplication.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package de.hftstuttgart.middleware;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.web.bind.annotation.RestController;
-
-@SpringBootApplication
-public class MiddlewareApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(MiddlewareApplication.class, args);
-	}
-
-	/*
-	@RestController
-	class Hello {
-		
-		@GetMapping("/") 
-		public String sayHello() {
-			return "Hello Kevin";
-		}	
-
-		@GetMapping("/hello") 
-		public String sayHelloAgain() {
-			return "Hello Kevin, from another REST Endpoint";
-		}	
-
-		@GetMapping("/hello/{parameter}") 
-		public String sayHelloWithParameter(@PathVariable String parameter) {
-			return "Hello Kevin, from another REST Endpoint " + parameter;
-		}
-	}
-	*/		
-}
\ No newline at end of file
diff --git a/src/main/java/de/kebidge/middleware/MiddlewareApplication.java b/src/main/java/de/kebidge/middleware/MiddlewareApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..ee5b5a8b961335f9444331f5688b01dbde05367f
--- /dev/null
+++ b/src/main/java/de/kebidge/middleware/MiddlewareApplication.java
@@ -0,0 +1,12 @@
+package de.kebidge.middleware;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class MiddlewareApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(MiddlewareApplication.class, args);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/de/hftstuttgart/middleware/ShoppingAPI.java b/src/main/java/de/kebidge/middleware/ShoppingAPI.java
similarity index 95%
rename from src/main/java/de/hftstuttgart/middleware/ShoppingAPI.java
rename to src/main/java/de/kebidge/middleware/ShoppingAPI.java
index f07d0f868831aae451e7082f0b2a0146fca11846..f7da15c0b255a5499470ebc91d9f40a56c13677e 100644
--- a/src/main/java/de/hftstuttgart/middleware/ShoppingAPI.java
+++ b/src/main/java/de/kebidge/middleware/ShoppingAPI.java
@@ -1,4 +1,4 @@
-package de.hftstuttgart.middleware;
+package de.kebidge.middleware;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -24,11 +24,6 @@ public class ShoppingAPI {
     
     Logger logger = LoggerFactory.getLogger(ShoppingAPI.class);
 
-    /*public ShoppingAPI(ShoppingItemRepository shoppingItemRepository) {
-        this.shoppingItemRepository = shoppingItemRepository;
-    }*/
-
-
     @GetMapping("/shoppingItem")
     public ArrayList<Optional<ShoppingItem>> getShoppingItems() {
         
@@ -40,9 +35,6 @@ public class ShoppingAPI {
         
         Iterator<ShoppingItem> itemTerator = iterableItems.iterator();
 
-        // TODO: That should be work
-        //Iterator<Optional<ShoppingItem>> optionalItemTerator = optionalItemList.iterator();
-
         logger.info("----- GET Item -----");
 
         while(itemTerator.hasNext()){
@@ -187,11 +179,17 @@ public class ShoppingAPI {
 
                 if(itemAmount > 1) {
 
+                    /****************************************************
+                     *  ID bring nix da automatisch generiert !!!!!!!
+                     *  is aber nich schlimm
+                     *  amount ist ja richtig                      
+                     */
+
                     ShoppingItem newItem = new ShoppingItem(item);
                     
                     newItem.setAmount(itemAmount - 1);
                     newItem.setId(itemId);
-                    shoppingItemRepository.delete(tempItem);
+                    //shoppingItemRepository.delete(tempItem);
 
                     logger.info("----- DELETE Item (Amount) -----");
                     logger.info("id = {}", newItem.id);
diff --git a/src/main/java/de/hftstuttgart/middleware/ShoppingItem.java b/src/main/java/de/kebidge/middleware/ShoppingItem.java
similarity index 96%
rename from src/main/java/de/hftstuttgart/middleware/ShoppingItem.java
rename to src/main/java/de/kebidge/middleware/ShoppingItem.java
index 1f801158e6f42107cfb9bb8f62d135471e4258c7..135090c8baad5faa9a4d211e5863391ae11e65ce 100644
--- a/src/main/java/de/hftstuttgart/middleware/ShoppingItem.java
+++ b/src/main/java/de/kebidge/middleware/ShoppingItem.java
@@ -1,4 +1,4 @@
-package de.hftstuttgart.middleware;
+package de.kebidge.middleware;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/src/main/java/de/hftstuttgart/middleware/ShoppingItemRepository.java b/src/main/java/de/kebidge/middleware/ShoppingItemRepository.java
similarity index 87%
rename from src/main/java/de/hftstuttgart/middleware/ShoppingItemRepository.java
rename to src/main/java/de/kebidge/middleware/ShoppingItemRepository.java
index dd4f573f23201bfd3ae6292eab28481d335bd48c..ed0b6fa96543bce0656b1b7ad9ed9d1806017485 100644
--- a/src/main/java/de/hftstuttgart/middleware/ShoppingItemRepository.java
+++ b/src/main/java/de/kebidge/middleware/ShoppingItemRepository.java
@@ -1,4 +1,4 @@
-package de.hftstuttgart.middleware;
+package de.kebidge.middleware;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 72e222172f4fd2be12cb2fa5d070c46076c8bc2d..da3ef5c8a543c65e01ef132a828f67d0ef291be3 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,9 +1,9 @@
-spring.datasource.url=jdbc:postgresql://localhost:5432/kevindb
-spring.datasource.username=kevin
+spring.datasource.url=jdbc:postgresql://localhost:5432/kebidgedata
+spring.datasource.username=kebidge
 spring.datasource.password=password
 
 spring.jpa.hibernate.ddl-auto=update
 
 server.port = 8181
 
-logging.level.de.hftstuttgart=INFO
\ No newline at end of file
+logging.level.de.kebidge=INFO
\ No newline at end of file
diff --git a/src/test/java/de/hftstuttgart/middleware/MiddlewareApplicationTests.java b/src/test/java/de/kebidge/middleware/MiddlewareApplicationTests.java
similarity index 83%
rename from src/test/java/de/hftstuttgart/middleware/MiddlewareApplicationTests.java
rename to src/test/java/de/kebidge/middleware/MiddlewareApplicationTests.java
index 89cecbde351af75fe95f6c8e755cff20f0ef4ab7..491bd464c3404d2924ee35e60a853a8f8506c38a 100644
--- a/src/test/java/de/hftstuttgart/middleware/MiddlewareApplicationTests.java
+++ b/src/test/java/de/kebidge/middleware/MiddlewareApplicationTests.java
@@ -1,4 +1,4 @@
-package de.hftstuttgart.middleware;
+package de.kebidge.middleware;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;