diff --git a/src/ei/engine/network/message/KeepAliveMessage.java b/src/ei/engine/network/message/KeepAliveMessage.java
new file mode 100644
index 0000000..7e9e46e
--- /dev/null
+++ b/src/ei/engine/network/message/KeepAliveMessage.java
@@ -0,0 +1,16 @@
+package ei.engine.network.message;
+
+import ei.engine.network.message.type.SystemMessage;
+
+/**
+ * Tells the destination that the 
+ * source is still online
+ * 
+ * @author Ziver
+ *
+ */
+public class KeepAliveMessage extends Message implements SystemMessage{
+
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/ei/engine/network/message/type/KeepAliveMessage.java b/src/ei/engine/network/message/type/KeepAliveMessage.java
deleted file mode 100644
index 47b2a94..0000000
--- a/src/ei/engine/network/message/type/KeepAliveMessage.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package ei.engine.network.message.type;
-
-/**
- * Tells the destination that the 
- * source is still online
- * 
- * @author Ziver
- *
- */
-public interface KeepAliveMessage {
-
-}