diff --git a/ConnectionMode.go b/ConnectionMode.go
new file mode 100644
index 0000000..00f0105
--- /dev/null
+++ b/ConnectionMode.go
@@ -0,0 +1,29 @@
+package libnmdc
+
+import (
+	"fmt"
+)
+
+type ConnectionMode rune
+
+const (
+	CONNECTIONMODE_ACTIVE  ConnectionMode = 'A' // 65
+	CONNECTIONMODE_PASSIVE ConnectionMode = 'P' // 49
+	CONNECTIONMODE_SOCKS5  ConnectionMode = '5' // 53
+)
+
+func (this ConnectionMode) String() string {
+	switch this {
+	case CONNECTIONMODE_ACTIVE:
+		return "Active"
+
+	case CONNECTIONMODE_PASSIVE:
+		return "Passive"
+
+	case CONNECTIONMODE_SOCKS5:
+		return "SOCKS5"
+
+	default:
+		return fmt.Sprintf("ConnectionMode(\"%s\")", string(this))
+	}
+}
diff --git a/UserFlag.go b/UserFlag.go
new file mode 100644
index 0000000..7664aea
--- /dev/null
+++ b/UserFlag.go
@@ -0,0 +1,17 @@
+package libnmdc
+
+type UserFlag byte
+
+const (
+	FLAG_NORMAL          UserFlag = 1
+	FLAG_AWAY_1          UserFlag = 2
+	FLAG_AWAY_2          UserFlag = 3
+	FLAG_SERVER_1        UserFlag = 4
+	FLAG_SERVER_2        UserFlag = 5
+	FLAG_SERVER_AWAY_1   UserFlag = 6
+	FLAG_SERVER_AWAY_2   UserFlag = 7
+	FLAG_FIREBALL_1      UserFlag = 8
+	FLAG_FIREBALL_2      UserFlag = 9
+	FLAG_FIREBALL_AWAY_1 UserFlag = 10
+	FLAG_FIREBALL_AWAY_2 UserFlag = 11
+)
diff --git a/UserInfo.go b/UserInfo.go
index 6447cd6..771cf31 100644
--- a/UserInfo.go
+++ b/UserInfo.go
@@ -9,46 +9,6 @@ import (
 	"strings"
 )
 
-type UserFlag byte
-
-const (
-	FLAG_NORMAL          UserFlag = 1
-	FLAG_AWAY_1          UserFlag = 2
-	FLAG_AWAY_2          UserFlag = 3
-	FLAG_SERVER_1        UserFlag = 4
-	FLAG_SERVER_2        UserFlag = 5
-	FLAG_SERVER_AWAY_1   UserFlag = 6
-	FLAG_SERVER_AWAY_2   UserFlag = 7
-	FLAG_FIREBALL_1      UserFlag = 8
-	FLAG_FIREBALL_2      UserFlag = 9
-	FLAG_FIREBALL_AWAY_1 UserFlag = 10
-	FLAG_FIREBALL_AWAY_2 UserFlag = 11
-)
-
-type ConnectionMode rune
-
-const (
-	CONNECTIONMODE_ACTIVE  ConnectionMode = 'A' // 65
-	CONNECTIONMODE_PASSIVE ConnectionMode = 'P' // 49
-	CONNECTIONMODE_SOCKS5  ConnectionMode = '5' // 53
-)
-
-func (this ConnectionMode) String() string {
-	switch this {
-	case CONNECTIONMODE_ACTIVE:
-		return "Active"
-
-	case CONNECTIONMODE_PASSIVE:
-		return "Passive"
-
-	case CONNECTIONMODE_SOCKS5:
-		return "SOCKS5"
-
-	default:
-		return fmt.Sprintf("ConnectionMode(\"%s\")", string(this))
-	}
-}
-
 // This structure represents a user connected to a hub.
 type UserInfo struct {
 	Nick             string