4 files changed, 39 insertions, 40 deletions

diff --git a/packets/classes/cmdinfo.go b/packets/classes/cmdinfo.go
index bfe732d..52df05c 100644
--- a/packets/classes/cmdinfo.go
+++ b/packets/classes/cmdinfo.go
@@ -2,6 +2,16 @@ package classes
 
 import "github.com/pektezol/bitreader"
 
+type CmdInfo struct {
+        Flags            int32
+        ViewOrigin       []float32
+        ViewAngles       []float32
+        LocalViewAngles  []float32
+        ViewOrigin2      []float32
+        ViewAngles2      []float32
+        LocalViewAngles2 []float32
+}
+
 func ParseCmdInfo(reader *bitreader.ReaderType, MSSC int) []CmdInfo {
         var out []CmdInfo
         for i := 0; i < MSSC; i++ {
diff --git a/packets/classes/stringtable.go b/packets/classes/stringtable.go
index 64e8496..a1432f9 100644
--- a/packets/classes/stringtable.go
+++ b/packets/classes/stringtable.go
@@ -6,6 +6,18 @@ import (
         "github.com/pektezol/bitreader"
 )
 
+type StringTable struct {
+        TableName          string
+        NumOfEntries       int16
+        EntryName          string
+        EntrySize          int16
+        EntryData          []byte
+        NumOfClientEntries int16
+        ClientEntryName    string
+        ClientEntrySize    int16
+        ClientEntryData    []byte
+}
+
 func ParseStringTable(data []byte) []StringTable {
         reader := bitreader.Reader(bytes.NewReader(data), true)
         var stringTables []StringTable
diff --git a/packets/classes/types.go b/packets/classes/types.go
deleted file mode 100644
index a1a281e..0000000
--- a/packets/classes/types.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package classes
-
-type CmdInfo struct {
-        Flags            int32
-        ViewOrigin       []float32
-        ViewAngles       []float32
-        LocalViewAngles  []float32
-        ViewOrigin2      []float32
-        ViewAngles2      []float32
-        LocalViewAngles2 []float32
-}
-
-type UserCmdInfo struct {
-        CommandNumber int32
-        TickCount     int32
-        ViewAnglesX   float32
-        ViewAnglesY   float32
-        ViewAnglesZ   float32
-        ForwardMove   float32
-        SideMove      float32
-        UpMove        float32
-        Buttons       int32
-        Impulse       byte
-        WeaponSelect  int
-        WeaponSubtype int
-        MouseDx       int16
-        MouseDy       int16
-}
-
-type StringTable struct {
-        TableName          string
-        NumOfEntries       int16
-        EntryName          string
-        EntrySize          int16
-        EntryData          []byte
-        NumOfClientEntries int16
-        ClientEntryName    string
-        ClientEntrySize    int16
-        ClientEntryData    []byte
-}
diff --git a/packets/classes/usercmd.go b/packets/classes/usercmd.go
index 78e9c58..d3328fd 100644
--- a/packets/classes/usercmd.go
+++ b/packets/classes/usercmd.go
@@ -6,6 +6,23 @@ import (
         "github.com/pektezol/bitreader"
 )
 
+type UserCmdInfo struct {
+        CommandNumber int32
+        TickCount     int32
+        ViewAnglesX   float32
+        ViewAnglesY   float32
+        ViewAnglesZ   float32
+        ForwardMove   float32
+        SideMove      float32
+        UpMove        float32
+        Buttons       int32
+        Impulse       byte
+        WeaponSelect  int
+        WeaponSubtype int
+        MouseDx       int16
+        MouseDy       int16
+}
+
 func ParseUserCmdInfo(data []byte) UserCmdInfo {
         reader := bitreader.Reader(bytes.NewReader(data), true)
         var userCmdInfo UserCmdInfo