diff --git a/src/main/java/de/szut/webshop/article/ArticleController.java b/src/main/java/de/szut/webshop/controller/ArticleController.java
similarity index 79%
rename from src/main/java/de/szut/webshop/article/ArticleController.java
rename to src/main/java/de/szut/webshop/controller/ArticleController.java
index 65b73fd..5f33fc2 100644
--- a/src/main/java/de/szut/webshop/article/ArticleController.java
+++ b/src/main/java/de/szut/webshop/controller/ArticleController.java
@@ -1,5 +1,7 @@
-package de.szut.webshop.article;
+package de.szut.webshop.controller;
 
+import de.szut.webshop.model.ArticleEntity;
+import de.szut.webshop.service.ArticleService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
diff --git a/src/main/java/de/szut/webshop/supplier/SupplierController.java b/src/main/java/de/szut/webshop/controller/SupplierController.java
similarity index 82%
rename from src/main/java/de/szut/webshop/supplier/SupplierController.java
rename to src/main/java/de/szut/webshop/controller/SupplierController.java
index 9396455..952019d 100644
--- a/src/main/java/de/szut/webshop/supplier/SupplierController.java
+++ b/src/main/java/de/szut/webshop/controller/SupplierController.java
@@ -1,5 +1,9 @@
-package de.szut.webshop.supplier;
+package de.szut.webshop.controller;
 
+import de.szut.webshop.dto.AddSupplierDto;
+import de.szut.webshop.model.ContactEntity;
+import de.szut.webshop.model.SupplierEntity;
+import de.szut.webshop.service.SupplierService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/de/szut/webshop/supplier/AddSupplierDto.java b/src/main/java/de/szut/webshop/dto/AddSupplierDto.java
similarity index 95%
rename from src/main/java/de/szut/webshop/supplier/AddSupplierDto.java
rename to src/main/java/de/szut/webshop/dto/AddSupplierDto.java
index 606057a..4f0a878 100644
--- a/src/main/java/de/szut/webshop/supplier/AddSupplierDto.java
+++ b/src/main/java/de/szut/webshop/dto/AddSupplierDto.java
@@ -1,4 +1,4 @@
-package de.szut.webshop.supplier;
+package de.szut.webshop.dto;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
diff --git a/src/main/java/de/szut/webshop/article/ArticleEntity.java b/src/main/java/de/szut/webshop/model/ArticleEntity.java
similarity index 91%
rename from src/main/java/de/szut/webshop/article/ArticleEntity.java
rename to src/main/java/de/szut/webshop/model/ArticleEntity.java
index 4c59975..45fe9c7 100644
--- a/src/main/java/de/szut/webshop/article/ArticleEntity.java
+++ b/src/main/java/de/szut/webshop/model/ArticleEntity.java
@@ -1,12 +1,12 @@
-package de.szut.webshop.article;
+package de.szut.webshop.model;
 
-import de.szut.webshop.supplier.SupplierEntity;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+
 import java.time.LocalDateTime;
 
 @Getter
diff --git a/src/main/java/de/szut/webshop/supplier/ContactEntity.java b/src/main/java/de/szut/webshop/model/ContactEntity.java
similarity index 96%
rename from src/main/java/de/szut/webshop/supplier/ContactEntity.java
rename to src/main/java/de/szut/webshop/model/ContactEntity.java
index 6291e39..c36161c 100644
--- a/src/main/java/de/szut/webshop/supplier/ContactEntity.java
+++ b/src/main/java/de/szut/webshop/model/ContactEntity.java
@@ -1,4 +1,4 @@
-package de.szut.webshop.supplier;
+package de.szut.webshop.model;
 
 
 import jakarta.persistence.*;
diff --git a/src/main/java/de/szut/webshop/supplier/SupplierEntity.java b/src/main/java/de/szut/webshop/model/SupplierEntity.java
similarity index 90%
rename from src/main/java/de/szut/webshop/supplier/SupplierEntity.java
rename to src/main/java/de/szut/webshop/model/SupplierEntity.java
index 7df0f5e..649d143 100644
--- a/src/main/java/de/szut/webshop/supplier/SupplierEntity.java
+++ b/src/main/java/de/szut/webshop/model/SupplierEntity.java
@@ -1,6 +1,5 @@
-package de.szut.webshop.supplier;
+package de.szut.webshop.model;
 
-import de.szut.webshop.article.ArticleEntity;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
diff --git a/src/main/java/de/szut/webshop/article/ArticleRepository.java b/src/main/java/de/szut/webshop/repository/ArticleRepository.java
similarity index 64%
rename from src/main/java/de/szut/webshop/article/ArticleRepository.java
rename to src/main/java/de/szut/webshop/repository/ArticleRepository.java
index fa4fcec..13fde6d 100644
--- a/src/main/java/de/szut/webshop/article/ArticleRepository.java
+++ b/src/main/java/de/szut/webshop/repository/ArticleRepository.java
@@ -1,5 +1,6 @@
-package de.szut.webshop.article;
+package de.szut.webshop.repository;
 
+import de.szut.webshop.model.ArticleEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ArticleRepository extends JpaRepository<ArticleEntity, Long> {
diff --git a/src/main/java/de/szut/webshop/supplier/SupplierRepository.java b/src/main/java/de/szut/webshop/repository/SupplierRepository.java
similarity index 64%
rename from src/main/java/de/szut/webshop/supplier/SupplierRepository.java
rename to src/main/java/de/szut/webshop/repository/SupplierRepository.java
index 8d98c14..2ec68e1 100644
--- a/src/main/java/de/szut/webshop/supplier/SupplierRepository.java
+++ b/src/main/java/de/szut/webshop/repository/SupplierRepository.java
@@ -1,5 +1,6 @@
-package de.szut.webshop.supplier;
+package de.szut.webshop.repository;
 
+import de.szut.webshop.model.SupplierEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface SupplierRepository extends JpaRepository<SupplierEntity, Long> {
diff --git a/src/main/java/de/szut/webshop/article/ArticleService.java b/src/main/java/de/szut/webshop/service/ArticleService.java
similarity index 75%
rename from src/main/java/de/szut/webshop/article/ArticleService.java
rename to src/main/java/de/szut/webshop/service/ArticleService.java
index b54f99d..816daa0 100644
--- a/src/main/java/de/szut/webshop/article/ArticleService.java
+++ b/src/main/java/de/szut/webshop/service/ArticleService.java
@@ -1,5 +1,7 @@
-package de.szut.webshop.article;
+package de.szut.webshop.service;
 
+import de.szut.webshop.model.ArticleEntity;
+import de.szut.webshop.repository.ArticleRepository;
 import org.springframework.stereotype.Service;
 import java.util.Collection;
 
diff --git a/src/main/java/de/szut/webshop/supplier/SupplierService.java b/src/main/java/de/szut/webshop/service/SupplierService.java
similarity index 88%
rename from src/main/java/de/szut/webshop/supplier/SupplierService.java
rename to src/main/java/de/szut/webshop/service/SupplierService.java
index 931511e..a719fa2 100644
--- a/src/main/java/de/szut/webshop/supplier/SupplierService.java
+++ b/src/main/java/de/szut/webshop/service/SupplierService.java
@@ -1,5 +1,7 @@
-package de.szut.webshop.supplier;
+package de.szut.webshop.service;
 
+import de.szut.webshop.model.SupplierEntity;
+import de.szut.webshop.repository.SupplierRepository;
 import org.springframework.stereotype.Service;
 
 @Service