diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java
index 1ba4b60603..11b9ada175 100644
--- a/src/main/java/client/Character.java
+++ b/src/main/java/client/Character.java
@@ -73,6 +73,7 @@ import server.partyquest.MonsterCarnival;
 import server.partyquest.MonsterCarnivalParty;
 import server.partyquest.PartyQuest;
 import server.quest.Quest;
+import server.shop.Shop;
 import tools.*;
 import tools.exceptions.NotEnabledException;
 import tools.packets.WeddingPackets;
diff --git a/src/main/java/client/command/CommandContext.java b/src/main/java/client/command/CommandContext.java
index 58f7c7b8a1..e534a2af7f 100644
--- a/src/main/java/client/command/CommandContext.java
+++ b/src/main/java/client/command/CommandContext.java
@@ -1,7 +1,10 @@
 package client.command;
 
 import database.drop.DropProvider;
-import server.ShopFactory;
+import server.shop.ShopFactory;
 
+/**
+ * @author Ponk
+ */
 public record CommandContext(DropProvider dropProvider, ShopFactory shopFactory) {
 }
diff --git a/src/main/java/net/ChannelDependencies.java b/src/main/java/net/ChannelDependencies.java
index cd25a70014..1c8d7db0f3 100644
--- a/src/main/java/net/ChannelDependencies.java
+++ b/src/main/java/net/ChannelDependencies.java
@@ -4,11 +4,14 @@ import client.command.CommandsExecutor;
 import client.processor.action.MakerProcessor;
 import client.processor.npc.FredrickProcessor;
 import database.drop.DropProvider;
-import server.ShopFactory;
+import server.shop.ShopFactory;
 import service.NoteService;
 
 import java.util.Objects;
 
+/**
+ * @author Ponk
+ */
 public record ChannelDependencies(
         NoteService noteService, FredrickProcessor fredrickProcessor, MakerProcessor makerProcessor,
         DropProvider dropProvider, CommandsExecutor commandsExecutor, ShopFactory shopFactory
diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java
index dd637a90e5..4043a2c430 100644
--- a/src/main/java/net/server/Server.java
+++ b/src/main/java/net/server/Server.java
@@ -66,13 +66,13 @@ import org.apache.logging.log4j.LogManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import server.CashShop.CashItemFactory;
-import server.ShopFactory;
 import server.SkillbookInformationProvider;
 import server.ThreadManager;
 import server.TimerManager;
 import server.expeditions.ExpeditionBossLog;
 import server.life.PlayerNPCFactory;
 import server.quest.Quest;
+import server.shop.ShopFactory;
 import service.NoteService;
 import tools.DatabaseConnection;
 import tools.Pair;
diff --git a/src/main/java/net/server/channel/handlers/NPCTalkHandler.java b/src/main/java/net/server/channel/handlers/NPCTalkHandler.java
index c74bda40cd..701d0864da 100644
--- a/src/main/java/net/server/channel/handlers/NPCTalkHandler.java
+++ b/src/main/java/net/server/channel/handlers/NPCTalkHandler.java
@@ -30,10 +30,10 @@ import net.packet.InPacket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import scripting.npc.NPCScriptManager;
-import server.ShopFactory;
 import server.life.NPC;
 import server.life.PlayerNPC;
 import server.maps.MapObject;
+import server.shop.ShopFactory;
 import tools.PacketCreator;
 
 public final class NPCTalkHandler extends AbstractPacketHandler {
diff --git a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java
index 6d5e852190..1f2d357f26 100644
--- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java
+++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java
@@ -43,10 +43,10 @@ import net.server.Server;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import server.ItemInformationProvider;
-import server.Shop;
-import server.ShopFactory;
 import server.TimerManager;
 import server.maps.*;
+import server.shop.Shop;
+import server.shop.ShopFactory;
 import service.NoteService;
 import tools.PacketCreator;
 import tools.Pair;
diff --git a/src/main/java/server/Shop.java b/src/main/java/server/shop/Shop.java
similarity index 99%
rename from src/main/java/server/Shop.java
rename to src/main/java/server/shop/Shop.java
index f017f1af39..b420d5c71c 100644
--- a/src/main/java/server/Shop.java
+++ b/src/main/java/server/shop/Shop.java
@@ -19,7 +19,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package server;
+package server.shop;
 
 import client.Client;
 import client.inventory.InventoryType;
@@ -30,6 +30,7 @@ import constants.id.ItemId;
 import constants.inventory.ItemConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import server.ItemInformationProvider;
 import tools.PacketCreator;
 
 import java.util.ArrayList;
diff --git a/src/main/java/server/ShopFactory.java b/src/main/java/server/shop/ShopFactory.java
similarity index 87%
rename from src/main/java/server/ShopFactory.java
rename to src/main/java/server/shop/ShopFactory.java
index 985502ecb6..752a4e8aec 100644
--- a/src/main/java/server/ShopFactory.java
+++ b/src/main/java/server/shop/ShopFactory.java
@@ -19,7 +19,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package server;
+package server.shop;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
@@ -70,15 +70,15 @@ public class ShopFactory {
         return Optional.of(new Shop(dbShop.get().id(), dbShop.get().npcId(), fromDbShopItems(items)));
     }
 
-    private List<server.ShopItem> fromDbShopItems(List<ShopItem> dbItems) {
-        Stream<server.ShopItem> purchaseableItems = dbItems.stream()
+    private List<server.shop.ShopItem> fromDbShopItems(List<ShopItem> dbItems) {
+        Stream<server.shop.ShopItem> purchaseableItems = dbItems.stream()
                 .map(dbItem -> {
                     short buyable = ItemConstants.isRechargeable(dbItem.itemId()) ? (short) 1 : MAX_QUANTITY_PER_PURCHASE;
                     int pitch = dbItem.pitch() == null ? 0 : dbItem.pitch();
-                    return new server.ShopItem(buyable, dbItem.itemId(), dbItem.price(), pitch);
+                    return new server.shop.ShopItem(buyable, dbItem.itemId(), dbItem.price(), pitch);
                 });
-        Stream<server.ShopItem> rechargeableItems = rechargeableItemIds.stream()
-                .map(rechItem -> new server.ShopItem((short) 0, rechItem, 0, 0));
+        Stream<server.shop.ShopItem> rechargeableItems = rechargeableItemIds.stream()
+                .map(rechItem -> new server.shop.ShopItem((short) 0, rechItem, 0, 0));
         return Stream.concat(purchaseableItems, rechargeableItems).toList();
     }
 
diff --git a/src/main/java/server/ShopItem.java b/src/main/java/server/shop/ShopItem.java
similarity index 98%
rename from src/main/java/server/ShopItem.java
rename to src/main/java/server/shop/ShopItem.java
index 6fe6fcd3c8..7649c0e871 100644
--- a/src/main/java/server/ShopItem.java
+++ b/src/main/java/server/shop/ShopItem.java
@@ -19,7 +19,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package server;
+package server.shop;
 
 /**
  * @author Matze
diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java
index b7dfe1e1b8..74d3d46591 100644
--- a/src/main/java/tools/PacketCreator.java
+++ b/src/main/java/tools/PacketCreator.java
@@ -62,12 +62,16 @@ import net.server.world.World;
 import server.CashShop.CashItem;
 import server.CashShop.CashItemFactory;
 import server.CashShop.SpecialCashItem;
-import server.*;
+import server.DueyPackage;
+import server.ItemInformationProvider;
+import server.MTSItemInfo;
+import server.Trade;
 import server.events.gm.Snowball;
 import server.life.*;
 import server.maps.*;
 import server.maps.MiniGame.MiniGameResult;
 import server.movement.LifeMovementFragment;
+import server.shop.ShopItem;
 
 import java.awt.*;
 import java.net.InetAddress;