diff --git a/source/libdnet/messages/tools.d b/source/libdnet/messages/tools.d
new file mode 100644
index 0000000..4ad5608
--- /dev/null
+++ b/source/libdnet/messages/tools.d
@@ -0,0 +1,19 @@
+/**
+* TODO: Add information
+*/
+module libdnet.messages.tools;
+
+import libdnet.messages.types;
+import bmessage;
+
+/* TODO: Add bmessage encoder here */
+
+/**
+* BMessage encoder*
+*
+* This will encode the message for sending
+*/
+public ubyte[] encodeMessage()
+{
+	return null;
+}
diff --git a/source/libdnet/types.d b/source/libdnet/messages/types.d
similarity index 97%
rename from source/libdnet/types.d
rename to source/libdnet/messages/types.d
index 49eb758..3fdde62 100644
--- a/source/libdnet/types.d
+++ b/source/libdnet/messages/types.d
@@ -1,7 +1,7 @@
 /**
 * Type declarations
 */
-module libdnet.types;
+module libdnet.messages.types;
 
 import msgpack;
 
@@ -54,7 +54,8 @@ struct ServerMessage
 */
 public enum ClientType
 {
-	AUTH
+	AUTH,
+	ENTITYMESSAGE
 }
 
 /**