diff --git a/src/main/java/xyz/soukup/ecoCraftCore/EcoCraftCore.java b/src/main/java/xyz/soukup/ecoCraftCore/EcoCraftCore.java
index 372486b..ce8362f 100644
--- a/src/main/java/xyz/soukup/ecoCraftCore/EcoCraftCore.java
+++ b/src/main/java/xyz/soukup/ecoCraftCore/EcoCraftCore.java
@@ -9,10 +9,10 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
-import xyz.soukup.ecoCraftCore.commands.MoneyCommand;
+import xyz.soukup.ecoCraftCore.money.MoneyCommand;
+import xyz.soukup.ecoCraftCore.player.PreparePlayer;
 import xyz.soukup.ecoCraftCore.positionMarker.RulerCommand;
-import xyz.soukup.ecoCraftCore.commands.ShopCommand;
-import xyz.soukup.ecoCraftCore.events.*;
+import xyz.soukup.ecoCraftCore.shop.ShopCommand;
 import xyz.soukup.ecoCraftCore.database.objects.Account;
 import xyz.soukup.ecoCraftCore.database.objects.Shop;
 import xyz.soukup.ecoCraftCore.database.objects.Transaction;
@@ -21,6 +21,8 @@ import xyz.soukup.ecoCraftCore.inventory.VirtualChest;
 import xyz.soukup.ecoCraftCore.positionMarker.RulerMarking;
 import xyz.soukup.ecoCraftCore.database.DaoRegistry;
 import xyz.soukup.ecoCraftCore.messages.Messages;
+import xyz.soukup.ecoCraftCore.shop.ShopLogic;
+import xyz.soukup.ecoCraftCore.virtualChest.VirtualChestLogic;
 
 import java.io.IOException;
 import java.sql.SQLException;
diff --git a/src/main/java/xyz/soukup/ecoCraftCore/commands/MoneyCommand.java b/src/main/java/xyz/soukup/ecoCraftCore/money/MoneyCommand.java
similarity index 99%
rename from src/main/java/xyz/soukup/ecoCraftCore/commands/MoneyCommand.java
rename to src/main/java/xyz/soukup/ecoCraftCore/money/MoneyCommand.java
index 3921bb1..2590e1c 100644
--- a/src/main/java/xyz/soukup/ecoCraftCore/commands/MoneyCommand.java
+++ b/src/main/java/xyz/soukup/ecoCraftCore/money/MoneyCommand.java
@@ -1,4 +1,4 @@
-package xyz.soukup.ecoCraftCore.commands;
+package xyz.soukup.ecoCraftCore.money;
 
 import com.mojang.brigadier.arguments.FloatArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
diff --git a/src/main/java/xyz/soukup/ecoCraftCore/events/PreparePlayer.java b/src/main/java/xyz/soukup/ecoCraftCore/player/PreparePlayer.java
similarity index 90%
rename from src/main/java/xyz/soukup/ecoCraftCore/events/PreparePlayer.java
rename to src/main/java/xyz/soukup/ecoCraftCore/player/PreparePlayer.java
index c960d5b..991ff68 100644
--- a/src/main/java/xyz/soukup/ecoCraftCore/events/PreparePlayer.java
+++ b/src/main/java/xyz/soukup/ecoCraftCore/player/PreparePlayer.java
@@ -1,4 +1,4 @@
-package xyz.soukup.ecoCraftCore.events;
+package xyz.soukup.ecoCraftCore.player;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
diff --git a/src/main/java/xyz/soukup/ecoCraftCore/commands/ShopCommand.java b/src/main/java/xyz/soukup/ecoCraftCore/shop/ShopCommand.java
similarity index 98%
rename from src/main/java/xyz/soukup/ecoCraftCore/commands/ShopCommand.java
rename to src/main/java/xyz/soukup/ecoCraftCore/shop/ShopCommand.java
index a768b3a..591003e 100644
--- a/src/main/java/xyz/soukup/ecoCraftCore/commands/ShopCommand.java
+++ b/src/main/java/xyz/soukup/ecoCraftCore/shop/ShopCommand.java
@@ -1,4 +1,4 @@
-package xyz.soukup.ecoCraftCore.commands;
+package xyz.soukup.ecoCraftCore.shop;
 
 import com.mojang.brigadier.arguments.*;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
diff --git a/src/main/java/xyz/soukup/ecoCraftCore/events/ShopLogic.java b/src/main/java/xyz/soukup/ecoCraftCore/shop/ShopLogic.java
similarity index 99%
rename from src/main/java/xyz/soukup/ecoCraftCore/events/ShopLogic.java
rename to src/main/java/xyz/soukup/ecoCraftCore/shop/ShopLogic.java
index ddb250b..e9905a6 100644
--- a/src/main/java/xyz/soukup/ecoCraftCore/events/ShopLogic.java
+++ b/src/main/java/xyz/soukup/ecoCraftCore/shop/ShopLogic.java
@@ -1,4 +1,4 @@
-package xyz.soukup.ecoCraftCore.events;
+package xyz.soukup.ecoCraftCore.shop;
 import com.github.stefvanschie.inventoryframework.gui.GuiItem;
 import com.github.stefvanschie.inventoryframework.gui.type.ChestGui;
 import com.github.stefvanschie.inventoryframework.pane.StaticPane;
@@ -22,6 +22,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
+import xyz.soukup.ecoCraftCore.virtualChest.VirtualChestLogic;
 import xyz.soukup.ecoCraftCore.gui.GuiItemBuilder;
 import xyz.soukup.ecoCraftCore.inventory.InventoryUtils;
 import xyz.soukup.ecoCraftCore.messages.Messages;
diff --git a/src/main/java/xyz/soukup/ecoCraftCore/events/VirtualChestLogic.java b/src/main/java/xyz/soukup/ecoCraftCore/virtualChest/VirtualChestLogic.java
similarity index 98%
rename from src/main/java/xyz/soukup/ecoCraftCore/events/VirtualChestLogic.java
rename to src/main/java/xyz/soukup/ecoCraftCore/virtualChest/VirtualChestLogic.java
index 2699dfa..f84bf9f 100644
--- a/src/main/java/xyz/soukup/ecoCraftCore/events/VirtualChestLogic.java
+++ b/src/main/java/xyz/soukup/ecoCraftCore/virtualChest/VirtualChestLogic.java
@@ -1,4 +1,4 @@
-package xyz.soukup.ecoCraftCore.events;
+package xyz.soukup.ecoCraftCore.virtualChest;
 
 import org.bukkit.block.Chest;
 import org.bukkit.block.DoubleChest;