diff --git a/src/com/cnaude/chairs/core/api/ChairsAPI.java b/src/com/cnaude/chairs/api/ChairsAPI.java
similarity index 89%
rename from src/com/cnaude/chairs/core/api/ChairsAPI.java
rename to src/com/cnaude/chairs/api/ChairsAPI.java
index 4ad4fe0..7b7af17 100644
--- a/src/com/cnaude/chairs/core/api/ChairsAPI.java
+++ b/src/com/cnaude/chairs/api/ChairsAPI.java
@@ -1,4 +1,4 @@
-package com.cnaude.chairs.core.api;
+package com.cnaude.chairs.api;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/com/cnaude/chairs/core/api/PlayerChairSitEvent.java b/src/com/cnaude/chairs/api/PlayerChairSitEvent.java
similarity index 95%
rename from src/com/cnaude/chairs/core/api/PlayerChairSitEvent.java
rename to src/com/cnaude/chairs/api/PlayerChairSitEvent.java
index 177edeb..0e35c60 100644
--- a/src/com/cnaude/chairs/core/api/PlayerChairSitEvent.java
+++ b/src/com/cnaude/chairs/api/PlayerChairSitEvent.java
@@ -1,4 +1,4 @@
-package com.cnaude.chairs.core.api;
+package com.cnaude.chairs.api;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
diff --git a/src/com/cnaude/chairs/core/api/PlayerChairUnsitEvent.java b/src/com/cnaude/chairs/api/PlayerChairUnsitEvent.java
similarity index 95%
rename from src/com/cnaude/chairs/core/api/PlayerChairUnsitEvent.java
rename to src/com/cnaude/chairs/api/PlayerChairUnsitEvent.java
index ebaf118..c50e405 100644
--- a/src/com/cnaude/chairs/core/api/PlayerChairUnsitEvent.java
+++ b/src/com/cnaude/chairs/api/PlayerChairUnsitEvent.java
@@ -1,4 +1,4 @@
-package com.cnaude.chairs.core.api;
+package com.cnaude.chairs.api;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
diff --git a/src/com/cnaude/chairs/core/Chairs.java b/src/com/cnaude/chairs/core/Chairs.java
index be72769..5f40c4f 100644
--- a/src/com/cnaude/chairs/core/Chairs.java
+++ b/src/com/cnaude/chairs/core/Chairs.java
@@ -14,9 +14,9 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import com.cnaude.chairs.api.ChairsAPI;
 import com.cnaude.chairs.commands.ChairsCommand;
 import com.cnaude.chairs.commands.ChairsIgnoreList;
-import com.cnaude.chairs.core.api.ChairsAPI;
 import com.cnaude.chairs.listeners.NANLoginListener;
 import com.cnaude.chairs.listeners.TrySitEventListener;
 import com.cnaude.chairs.listeners.TryUnsitEventListener;
diff --git a/src/com/cnaude/chairs/listeners/TrySitEventListener.java b/src/com/cnaude/chairs/listeners/TrySitEventListener.java
index e09b463..1eabd6b 100644
--- a/src/com/cnaude/chairs/listeners/TrySitEventListener.java
+++ b/src/com/cnaude/chairs/listeners/TrySitEventListener.java
@@ -33,8 +33,8 @@ public class TrySitEventListener implements Listener {
 
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onPlayerInteract(PlayerInteractEvent event) {
-		Player player = event.getPlayer();
 		if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+			Player player = event.getPlayer();
 			Block block = event.getClickedBlock();
 			if (sitAllowed(player, block)) {
 				event.setCancelled(true);
diff --git a/src/com/cnaude/chairs/vehiclearrow/nms164/CraftChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nms164/CraftChairsArrow.java
index 82299d6..dd0dd25 100644
--- a/src/com/cnaude/chairs/vehiclearrow/nms164/CraftChairsArrow.java
+++ b/src/com/cnaude/chairs/vehiclearrow/nms164/CraftChairsArrow.java
@@ -8,7 +8,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Vehicle;
 
-import com.cnaude.chairs.core.api.ChairsAPI;
+import com.cnaude.chairs.api.ChairsAPI;
 
 public class CraftChairsArrow extends CraftArrow implements Vehicle {
 
diff --git a/src/com/cnaude/chairs/vehiclearrow/nms172/CraftChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nms172/CraftChairsArrow.java
index 66411ba..8df728e 100644
--- a/src/com/cnaude/chairs/vehiclearrow/nms172/CraftChairsArrow.java
+++ b/src/com/cnaude/chairs/vehiclearrow/nms172/CraftChairsArrow.java
@@ -8,7 +8,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Vehicle;
 
-import com.cnaude.chairs.core.api.ChairsAPI;
+import com.cnaude.chairs.api.ChairsAPI;
 
 public class CraftChairsArrow extends CraftArrow implements Vehicle {