diff --git a/src/com/projectkorra/projectkorra/util/AbilityLoadEvent.java b/src/com/projectkorra/projectkorra/event/AbilityLoadEvent.java
similarity index 89%
rename from src/com/projectkorra/projectkorra/util/AbilityLoadEvent.java
rename to src/com/projectkorra/projectkorra/event/AbilityLoadEvent.java
index bee1265d..c2247700 100644
--- a/src/com/projectkorra/projectkorra/util/AbilityLoadEvent.java
+++ b/src/com/projectkorra/projectkorra/event/AbilityLoadEvent.java
@@ -1,66 +1,70 @@
-package com.projectkorra.projectkorra.util;
-
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.bukkit.plugin.Plugin;
-
-import java.util.jar.JarFile;
-
-/**
- * Called when an ability is successfully loaded.
- * 
- * @author kingbirdy
- */
-public class AbilityLoadEvent<T> extends Event {
-
-	private static final HandlerList handlers = new HandlerList();
-
-	private final Plugin plugin;
-	private final T loadable;
-	private final JarFile jarFile;
-
-	/**
-	 * Creates a new AbilityLoadEvent.
-	 * @param plugin The instance of ProjectKorra
-	 * @param loadable The class that was loaded
-	 * @param jarFile The JarFile the class was loaded from
-	 */
-	public AbilityLoadEvent(Plugin plugin, T loadable, JarFile jarFile) {
-		this.plugin = plugin;
-		this.loadable = loadable;
-		this.jarFile = jarFile;
-	}
-
-	@Override
-	public HandlerList getHandlers() {
-		return handlers;
-	}
-
-	public static HandlerList getHandlerList() {
-		return handlers;
-	}
-
-	/**
-	 * Gets the JarFile the ability was loaded from.
-	 * @return The JarFile from the event
-	 */
-	public JarFile getJarFile() {
-		return jarFile;
-	}
-
-	/**
-	 * Gets the ability's class that was loaded
-	 * @return The loaded class
-	 */
-	public T getLoadable() {
-		return loadable;
-	}
-
-	/**
-	 * Gets the ProjectKorra instance the ability was loaded into.
-	 * @return The ProjectKorra instance
-	 */
-	public Plugin getPlugin() {
-		return plugin;
-	}
-}
+package com.projectkorra.projectkorra.event;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.bukkit.plugin.Plugin;
+
+import java.util.jar.JarFile;
+
+/**
+ * Called when an ability is successfully loaded.
+ * 
+ * @author kingbirdy
+ */
+public class AbilityLoadEvent<T> extends Event {
+
+	private static final HandlerList handlers = new HandlerList();
+
+	private final Plugin plugin;
+	private final T loadable;
+	private final JarFile jarFile;
+
+	/**
+	 * Creates a new AbilityLoadEvent.
+	 * 
+	 * @param plugin The instance of ProjectKorra
+	 * @param loadable The class that was loaded
+	 * @param jarFile The JarFile the class was loaded from
+	 */
+	public AbilityLoadEvent(Plugin plugin, T loadable, JarFile jarFile) {
+		this.plugin = plugin;
+		this.loadable = loadable;
+		this.jarFile = jarFile;
+	}
+
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
+	/**
+	 * Gets the JarFile the ability was loaded from.
+	 * 
+	 * @return The JarFile from the event
+	 */
+	public JarFile getJarFile() {
+		return jarFile;
+	}
+
+	/**
+	 * Gets the ability's class that was loaded.
+	 * 
+	 * @return The loaded class
+	 */
+	public T getLoadable() {
+		return loadable;
+	}
+
+	/**
+	 * Gets the ProjectKorra instance the ability was loaded into.
+	 * 
+	 * @return The ProjectKorra instance
+	 */
+	public Plugin getPlugin() {
+		return plugin;
+	}
+}
diff --git a/src/com/projectkorra/projectkorra/util/AbilityLoader.java b/src/com/projectkorra/projectkorra/util/AbilityLoader.java
index 61fa3c8c..7b64e878 100644
--- a/src/com/projectkorra/projectkorra/util/AbilityLoader.java
+++ b/src/com/projectkorra/projectkorra/util/AbilityLoader.java
@@ -1,5 +1,6 @@
 package com.projectkorra.projectkorra.util;
 
+import com.projectkorra.projectkorra.event.AbilityLoadEvent;
 import com.projectkorra.projectkorra.util.AbilityLoadable.LoadResult;
 import com.projectkorra.projectkorra.util.AbilityLoadable.LoadResult.Result;
 
diff --git a/src/com/projectkorra/projectkorra/util/FileExtensionFilter.java b/src/com/projectkorra/projectkorra/util/FileExtensionFilter.java
index 17bf1270..323b96b5 100644
--- a/src/com/projectkorra/projectkorra/util/FileExtensionFilter.java
+++ b/src/com/projectkorra/projectkorra/util/FileExtensionFilter.java
@@ -15,6 +15,7 @@ public final class FileExtensionFilter implements FileFilter {
 
 	/**
 	 * Creates a new FileExtensionFilter.
+	 * 
 	 * @param extension the extension to filter for
 	 */
 	public FileExtensionFilter(String extension) {