diff --git a/src/main/java/baritone/api/event/events/BlockInteractEvent.java b/src/api/java/baritone/api/event/events/BlockInteractEvent.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/BlockInteractEvent.java
rename to src/api/java/baritone/api/event/events/BlockInteractEvent.java
diff --git a/src/main/java/baritone/api/event/events/ChatEvent.java b/src/api/java/baritone/api/event/events/ChatEvent.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/ChatEvent.java
rename to src/api/java/baritone/api/event/events/ChatEvent.java
diff --git a/src/main/java/baritone/api/event/events/ChunkEvent.java b/src/api/java/baritone/api/event/events/ChunkEvent.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/ChunkEvent.java
rename to src/api/java/baritone/api/event/events/ChunkEvent.java
diff --git a/src/main/java/baritone/api/event/events/PacketEvent.java b/src/api/java/baritone/api/event/events/PacketEvent.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/PacketEvent.java
rename to src/api/java/baritone/api/event/events/PacketEvent.java
diff --git a/src/main/java/baritone/api/event/events/PathEvent.java b/src/api/java/baritone/api/event/events/PathEvent.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/PathEvent.java
rename to src/api/java/baritone/api/event/events/PathEvent.java
diff --git a/src/main/java/baritone/api/event/events/PlayerUpdateEvent.java b/src/api/java/baritone/api/event/events/PlayerUpdateEvent.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/PlayerUpdateEvent.java
rename to src/api/java/baritone/api/event/events/PlayerUpdateEvent.java
diff --git a/src/main/java/baritone/api/event/events/RenderEvent.java b/src/api/java/baritone/api/event/events/RenderEvent.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/RenderEvent.java
rename to src/api/java/baritone/api/event/events/RenderEvent.java
diff --git a/src/main/java/baritone/api/event/events/RotationMoveEvent.java b/src/api/java/baritone/api/event/events/RotationMoveEvent.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/RotationMoveEvent.java
rename to src/api/java/baritone/api/event/events/RotationMoveEvent.java
diff --git a/src/main/java/baritone/api/event/events/TickEvent.java b/src/api/java/baritone/api/event/events/TickEvent.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/TickEvent.java
rename to src/api/java/baritone/api/event/events/TickEvent.java
diff --git a/src/main/java/baritone/api/event/events/WorldEvent.java b/src/api/java/baritone/api/event/events/WorldEvent.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/WorldEvent.java
rename to src/api/java/baritone/api/event/events/WorldEvent.java
diff --git a/src/main/java/baritone/api/event/events/type/Cancellable.java b/src/api/java/baritone/api/event/events/type/Cancellable.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/type/Cancellable.java
rename to src/api/java/baritone/api/event/events/type/Cancellable.java
diff --git a/src/main/java/baritone/api/event/events/type/EventState.java b/src/api/java/baritone/api/event/events/type/EventState.java
similarity index 100%
rename from src/main/java/baritone/api/event/events/type/EventState.java
rename to src/api/java/baritone/api/event/events/type/EventState.java
diff --git a/src/main/java/baritone/api/event/listener/AbstractGameEventListener.java b/src/api/java/baritone/api/event/listener/AbstractGameEventListener.java
similarity index 100%
rename from src/main/java/baritone/api/event/listener/AbstractGameEventListener.java
rename to src/api/java/baritone/api/event/listener/AbstractGameEventListener.java
diff --git a/src/main/java/baritone/api/event/listener/IGameEventListener.java b/src/api/java/baritone/api/event/listener/IGameEventListener.java
similarity index 100%
rename from src/main/java/baritone/api/event/listener/IGameEventListener.java
rename to src/api/java/baritone/api/event/listener/IGameEventListener.java
diff --git a/src/main/java/baritone/Baritone.java b/src/main/java/baritone/Baritone.java
index 5baacec8..3c7bf24c 100755
--- a/src/main/java/baritone/Baritone.java
+++ b/src/main/java/baritone/Baritone.java
@@ -17,9 +17,10 @@
 
 package baritone;
 
-import baritone.api.event.GameEventHandler;
+import baritone.api.event.listener.IGameEventListener;
 import baritone.behavior.Behavior;
 import baritone.behavior.impl.*;
+import baritone.event.GameEventHandler;
 import baritone.utils.InputOverrideHandler;
 import net.minecraft.client.Minecraft;
 
@@ -99,7 +100,7 @@ public enum Baritone {
         return this.initialized;
     }
 
-    public final GameEventHandler getGameEventHandler() {
+    public final IGameEventListener getGameEventHandler() {
         return this.gameEventHandler;
     }
 
diff --git a/src/main/java/baritone/api/event/GameEventHandler.java b/src/main/java/baritone/event/GameEventHandler.java
similarity index 89%
rename from src/main/java/baritone/api/event/GameEventHandler.java
rename to src/main/java/baritone/event/GameEventHandler.java
index 299ff323..e6dba1ec 100644
--- a/src/main/java/baritone/api/event/GameEventHandler.java
+++ b/src/main/java/baritone/event/GameEventHandler.java
@@ -15,24 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.event;
+package baritone.event;
 
 import baritone.Baritone;
 import baritone.api.event.events.*;