diff --git a/plugin/src/main/java/com/alttd/essentia/feature/flight/FlightFeature.java b/plugin/src/main/java/com/alttd/essentia/feature/flight/FlightFeature.java
new file mode 100644
index 0000000..2ad380a
--- /dev/null
+++ b/plugin/src/main/java/com/alttd/essentia/feature/flight/FlightFeature.java
@@ -0,0 +1,35 @@
+package com.alttd.essentia.feature.flight;
+
+import com.alttd.essentia.EssentiaPlugin;
+import com.alttd.essentia.feature.EssentiaFeature;
+import org.bukkit.plugin.PluginManager;
+
+public class FlightFeature implements EssentiaFeature {
+
+    private final EssentiaPlugin plugin;
+
+    private boolean enabled = false;
+
+    public FlightFeature() {
+        this.plugin = EssentiaPlugin.instance();
+    }
+
+    @Override
+    public String featureName() {
+        return "flight";
+    }
+
+    @Override
+    public void register() {
+        final PluginManager pluginManager = plugin.getServer().getPluginManager();
+        pluginManager.registerEvents(new FlightListener(), plugin);
+
+        this.enabled = true;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+}
diff --git a/plugin/src/main/java/com/alttd/essentia/listeners/FlightListener.java b/plugin/src/main/java/com/alttd/essentia/feature/flight/FlightListener.java
similarity index 90%
rename from plugin/src/main/java/com/alttd/essentia/listeners/FlightListener.java
rename to plugin/src/main/java/com/alttd/essentia/feature/flight/FlightListener.java
index 17a449d..d1d5505 100644
--- a/plugin/src/main/java/com/alttd/essentia/listeners/FlightListener.java
+++ b/plugin/src/main/java/com/alttd/essentia/feature/flight/FlightListener.java
@@ -1,4 +1,4 @@
-package com.alttd.essentia.listeners;
+package com.alttd.essentia.feature.flight;
 
 import com.alttd.essentia.EssentiaPlugin;
 import com.alttd.essentia.api.model.UserSettings;
@@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
-
+// TODO -- set flight and flying when player logs in!
 public class FlightListener implements Listener {
 
     private final EssentiaPlugin plugin;