diff --git a/core/src/main/java/mc/core/GameLoop.java b/core/src/main/java/mc/core/GameLoop.java
index da9cc1c..4dff4fc 100644
--- a/core/src/main/java/mc/core/GameLoop.java
+++ b/core/src/main/java/mc/core/GameLoop.java
@@ -7,13 +7,12 @@ package mc.core;
 import com.google.common.eventbus.Subscribe;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import mc.core.events.CS_PlayerMoveEvent;
-import mc.core.events.EventBusGetter;
-import mc.core.events.SC_ChunkLoadEvent;
+import mc.core.eventbus.CS_PlayerMoveEvent;
+import mc.core.eventbus.EventBusGetter;
+import mc.core.eventbus.SC_ChunkLoadEvent;
 import mc.core.player.PlayerManager;
 import mc.core.time.TimeProcessor;
 import mc.core.utils.CompactedCoords;
-import mc.core.world.World;
 import mc.core.world.chunk.Chunk;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/core/src/main/java/mc/core/events/CS_PlayerMoveEvent.java b/core/src/main/java/mc/core/eventbus/CS_PlayerMoveEvent.java
similarity index 96%
rename from core/src/main/java/mc/core/events/CS_PlayerMoveEvent.java
rename to core/src/main/java/mc/core/eventbus/CS_PlayerMoveEvent.java
index d44f7b1..3e20d87 100644
--- a/core/src/main/java/mc/core/events/CS_PlayerMoveEvent.java
+++ b/core/src/main/java/mc/core/eventbus/CS_PlayerMoveEvent.java
@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-05-02
  */
-package mc.core.events;
+package mc.core.eventbus;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/core/src/main/java/mc/core/events/Event.java b/core/src/main/java/mc/core/eventbus/Event.java
similarity index 89%
rename from core/src/main/java/mc/core/events/Event.java
rename to core/src/main/java/mc/core/eventbus/Event.java
index 066e7c8..08aa0ec 100644
--- a/core/src/main/java/mc/core/events/Event.java
+++ b/core/src/main/java/mc/core/eventbus/Event.java
@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-05-02
  */
-package mc.core.events;
+package mc.core.eventbus;
 
 public interface Event {
     void setCanceled(boolean value);
diff --git a/core/src/main/java/mc/core/events/EventBase.java b/core/src/main/java/mc/core/eventbus/EventBase.java
similarity index 89%
rename from core/src/main/java/mc/core/events/EventBase.java
rename to core/src/main/java/mc/core/eventbus/EventBase.java
index 8c4f030..7756cce 100644
--- a/core/src/main/java/mc/core/events/EventBase.java
+++ b/core/src/main/java/mc/core/eventbus/EventBase.java
@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-05-02
  */
-package mc.core.events;
+package mc.core.eventbus;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/core/src/main/java/mc/core/events/EventBusGetter.java b/core/src/main/java/mc/core/eventbus/EventBusGetter.java
similarity index 90%
rename from core/src/main/java/mc/core/events/EventBusGetter.java
rename to core/src/main/java/mc/core/eventbus/EventBusGetter.java
index d2e5aa3..82d3d42 100644
--- a/core/src/main/java/mc/core/events/EventBusGetter.java
+++ b/core/src/main/java/mc/core/eventbus/EventBusGetter.java
@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-05-02
  */
-package mc.core.events;
+package mc.core.eventbus;
 
 import com.google.common.eventbus.EventBus;
 
diff --git a/core/src/main/java/mc/core/events/LoginEvent.java b/core/src/main/java/mc/core/eventbus/LoginEvent.java
similarity index 93%
rename from core/src/main/java/mc/core/events/LoginEvent.java
rename to core/src/main/java/mc/core/eventbus/LoginEvent.java
index 63e123f..e264521 100644
--- a/core/src/main/java/mc/core/events/LoginEvent.java
+++ b/core/src/main/java/mc/core/eventbus/LoginEvent.java
@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-05-02
  */
-package mc.core.events;
+package mc.core.eventbus;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/core/src/main/java/mc/core/events/PlayerLookEvent.java b/core/src/main/java/mc/core/eventbus/PlayerLookEvent.java
similarity index 93%
rename from core/src/main/java/mc/core/events/PlayerLookEvent.java
rename to core/src/main/java/mc/core/eventbus/PlayerLookEvent.java
index 7506530..80f03e4 100644
--- a/core/src/main/java/mc/core/events/PlayerLookEvent.java
+++ b/core/src/main/java/mc/core/eventbus/PlayerLookEvent.java
@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-05-02
  */
-package mc.core.events;
+package mc.core.eventbus;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/core/src/main/java/mc/core/events/SC_ChunkLoadEvent.java b/core/src/main/java/mc/core/eventbus/SC_ChunkLoadEvent.java
similarity index 92%
rename from core/src/main/java/mc/core/events/SC_ChunkLoadEvent.java
rename to core/src/main/java/mc/core/eventbus/SC_ChunkLoadEvent.java
index 62d35c6..85ee1f5 100644
--- a/core/src/main/java/mc/core/events/SC_ChunkLoadEvent.java
+++ b/core/src/main/java/mc/core/eventbus/SC_ChunkLoadEvent.java
@@ -1,4 +1,4 @@
-package mc.core.events;
+package mc.core.eventbus;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/core/src/main/java/mc/core/events/SC_PlayerMoveEvent.java b/core/src/main/java/mc/core/eventbus/SC_PlayerMoveEvent.java
similarity index 92%
rename from core/src/main/java/mc/core/events/SC_PlayerMoveEvent.java
rename to core/src/main/java/mc/core/eventbus/SC_PlayerMoveEvent.java
index d64350b..c0fce73 100644
--- a/core/src/main/java/mc/core/events/SC_PlayerMoveEvent.java
+++ b/core/src/main/java/mc/core/eventbus/SC_PlayerMoveEvent.java
@@ -1,4 +1,4 @@
-package mc.core.events;
+package mc.core.eventbus;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/core/src/main/java/mc/core/events/ServerPingEvent.java b/core/src/main/java/mc/core/eventbus/ServerPingEvent.java
similarity index 93%
rename from core/src/main/java/mc/core/events/ServerPingEvent.java
rename to core/src/main/java/mc/core/eventbus/ServerPingEvent.java
index 3bbafce..58159ef 100644
--- a/core/src/main/java/mc/core/events/ServerPingEvent.java
+++ b/core/src/main/java/mc/core/eventbus/ServerPingEvent.java
@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-05-02
  */
-package mc.core.events;
+package mc.core.eventbus;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java
index 79be3f9..51318cb 100644
--- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java
+++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java
@@ -14,7 +14,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.util.AttributeKey;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import mc.core.events.EventBusGetter;
+import mc.core.eventbus.EventBusGetter;
 import mc.core.network.Server;
 import mc.core.network.StartServerException;
 import mc.core.network.proto_1_12_2.State;
diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java
index 63415cd..43e08c2 100644
--- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java
+++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java
@@ -2,14 +2,13 @@ package mc.core.network.proto_1_12_2.netty;
 
 import com.google.common.eventbus.Subscribe;
 import lombok.extern.slf4j.Slf4j;
-import mc.core.events.SC_ChunkLoadEvent;
-import mc.core.events.SC_PlayerMoveEvent;
+import mc.core.eventbus.SC_ChunkLoadEvent;
+import mc.core.eventbus.SC_PlayerMoveEvent;
 import mc.core.network.proto_1_12_2.TeleportManager;
 import mc.core.network.proto_1_12_2.packets.ChunkDataPacket;
 import mc.core.network.proto_1_12_2.packets.PlayerPositionAndLookPacket;
 import mc.core.utils.CompactedCoords;
 import mc.core.world.chunk.Chunk;
-import mc.core.world.chunk.ChunkSection;
 
 @Slf4j
 class PlayerEventListener {
diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
index 15cf04b..d5502a8 100644
--- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
+++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
@@ -6,8 +6,8 @@ package mc.core.network.proto_1_12_2.netty.handlers;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFutureListener;
-import mc.core.events.CS_PlayerMoveEvent;
-import mc.core.events.EventBusGetter;
+import mc.core.eventbus.CS_PlayerMoveEvent;
+import mc.core.eventbus.EventBusGetter;
 import mc.core.network.proto_1_12_2.State;
 import mc.core.network.proto_1_12_2.TeleportManager;
 import mc.core.network.proto_1_12_2.netty.wrappers.WrapperNetChannel;
diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java
index e4162c5..2c448b4 100644
--- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java
+++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java
@@ -8,8 +8,8 @@ import io.netty.channel.Channel;
 import lombok.extern.slf4j.Slf4j;
 import mc.core.EntityLocation;
 import mc.core.chat.ChatProcessor;
-import mc.core.events.CS_PlayerMoveEvent;
-import mc.core.events.EventBusGetter;
+import mc.core.eventbus.CS_PlayerMoveEvent;
+import mc.core.eventbus.EventBusGetter;
 import mc.core.network.proto_1_12_2.TeleportManager;
 import mc.core.network.proto_1_12_2.packets.*;
 import mc.core.player.Player;