another rewrite, v1.0.0

74 files changed, 1147 insertions, 997 deletions

diff --git a/cmd/parser.go b/cmd/parser.go
new file mode 100644
index 0000000..d03fa9c
--- /dev/null
+++ b/cmd/parser.go
@@ -0,0 +1,50 @@
+package main
+
+import (
+        "fmt"
+        "os"
+        "reflect"
+
+        "github.com/pektezol/bitreader"
+        "github.com/pektezol/demoparser/pkg/packets"
+)
+
+func main() {
+        if len(os.Args) != 2 {
+                panic("specify file in command line arguments")
+        }
+        files, err := os.ReadDir(os.Args[1])
+        if err != nil { // If it's not a directory
+                file, err := os.Open(os.Args[1])
+                if err != nil {
+                        panic(err)
+                }
+                reader := bitreader.Reader(file, true)
+                demoParserHandler(reader)
+                defer file.Close()
+        }
+        for _, fileinfo := range files { // If it is a directory
+                file, err := os.Open(os.Args[1] + fileinfo.Name())
+                if err != nil {
+                        panic(err)
+                }
+                reader := bitreader.Reader(file, true)
+                demoParserHandler(reader)
+                defer file.Close()
+        }
+        // fmt.Scanln()
+}
+
+func demoParserHandler(reader *bitreader.ReaderType) {
+        packets.ParseHeaders(reader)
+        for {
+                packet := packets.ParsePackets(reader)
+                if packet.PacketType == 7 {
+                        break
+                }
+                // if packet.PacketType != 5 {
+                //      continue
+                // }
+                fmt.Printf("[%d] %s (%d):\n\t%+v\n", packet.TickNumber, reflect.ValueOf(packet.Data).Type(), packet.PacketType, packet.Data)
+        }
+}
diff --git a/go.mod b/go.mod
index d1b68cc..408c7e3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,5 @@
 module github.com/pektezol/demoparser
 
-go 1.19
+go 1.21.0
 
-require github.com/pektezol/bitreader v1.2.9
+require github.com/pektezol/bitreader v1.3.0
diff --git a/go.sum b/go.sum
index 4cccb6e..190a8a8 100644
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,2 @@
-github.com/pektezol/bitreader v1.2.9 h1:DnCe5vDt6vC9zRVaeX47XjlcgK1i0jDPhYd8cimyPvo=
-github.com/pektezol/bitreader v1.2.9/go.mod h1:RKAUiA//jCPJzO10P+VSkBq4wfY38TaNjpCjQ+DmbcQ=
+github.com/pektezol/bitreader v1.3.0 h1:VOj1M+vw0+xuBUlD4HPHdkjnVdUrHw2nwa5Ccxxm2ek=
+github.com/pektezol/bitreader v1.3.0/go.mod h1:RKAUiA//jCPJzO10P+VSkBq4wfY38TaNjpCjQ+DmbcQ=
diff --git a/main.go b/main.go
deleted file mode 100644
index 8f05c2b..0000000
--- a/main.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package main
-
-import (
-        "fmt"
-        "io/ioutil"
-        "log"
-        "os"
-
-        "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/packets"
-)
-
-func main() {
-        if len(os.Args) != 2 {
-                log.Fatal("Specify file in command line arguments.")
-        }
-        files, err := ioutil.ReadDir(os.Args[1])
-        if err != nil { // If it's not a directory
-                file, err := os.Open(os.Args[1])
-                if err != nil {
-                        panic(err)
-                }
-                reader := bitreader.Reader(file, true)
-                packets.ParseHeader(reader)
-                for {
-                        code := packets.ParsePacket(reader)
-                        if code == 7 {
-                                break
-                        }
-                }
-                defer file.Close()
-        }
-        for _, fileinfo := range files { // If it is a directory
-                file, err := os.Open(os.Args[1] + fileinfo.Name())
-                if err != nil {
-                        panic(err)
-                }
-                /*messages.ParseHeader(file)
-                for {
-                        code := messages.ParseMessage(file)
-                        if code == 7 {
-                                messages.ParseMessage(file)
-                                break
-                        }
-                }*/
-                defer file.Close()
-        }
-        fmt.Scanln()
-}
diff --git a/packets/classes/cmdinfo.go b/packets/classes/cmdinfo.go
deleted file mode 100644
index d11bebc..0000000
--- a/packets/classes/cmdinfo.go
+++ /dev/null
@@ -1,61 +0,0 @@
-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++ {
-                flags := int32(reader.TryReadInt32())
-                viewOrigin := []float32{
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                }
-                viewAngles := []float32{
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                }
-                localViewAngles := []float32{
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                }
-                viewOrigin2 := []float32{
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                }
-                viewAngles2 := []float32{
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                }
-                localViewAngles2 := []float32{
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                        reader.TryReadFloat32(),
-                }
-                cmdInfo := CmdInfo{
-                        Flags:            flags,
-                        ViewOrigin:       viewOrigin,
-                        ViewAngles:       viewAngles,
-                        LocalViewAngles:  localViewAngles,
-                        ViewOrigin2:      viewOrigin2,
-                        ViewAngles2:      viewAngles2,
-                        LocalViewAngles2: localViewAngles2,
-                }
-                out = append(out, cmdInfo)
-        }
-        return out
-}
diff --git a/packets/classes/datatable.go b/packets/classes/datatable.go
deleted file mode 100644
index 405dae6..0000000
--- a/packets/classes/datatable.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package classes
-
-import (
-        "bytes"
-        "fmt"
-
-        "github.com/pektezol/bitreader"
-)
-
-type DataTable struct {
-        SendTable       []SendTable
-        ServerClassInfo []ServerClassInfo
-}
-
-type SendTable struct {
-        NeedsDecoder  bool
-        NetTableName  string
-        NumOfProps    uint16
-        SendPropType  int8
-        SendPropName  string
-        SendPropFlags int16
-}
-
-type ServerClassInfo struct {
-        ClassId       int16
-        ClassName     string
-        DataTableName string
-}
-
-func ParseDataTable(data []byte) DataTable {
-        reader := bitreader.Reader(bytes.NewReader(data), true)
-        sendtable := parseSendTable(reader)
-        serverclassinfo := parseServerClassInfo(reader)
-        return DataTable{
-                SendTable:       sendtable,
-                ServerClassInfo: serverclassinfo,
-        }
-}
-
-func parseSendTable(reader *bitreader.ReaderType) []SendTable {
-        var sendtables []SendTable
-        for reader.TryReadBool() {
-                sendtables = append(sendtables, SendTable{
-                        NeedsDecoder:  reader.TryReadBool(),
-                        NetTableName:  reader.TryReadString(),
-                        NumOfProps:    uint16(reader.TryReadBits(10)),
-                        SendPropType:  int8(reader.TryReadBits(5)),
-                        SendPropName:  reader.TryReadString(),
-                        SendPropFlags: int16(reader.TryReadInt16()),
-                })
-        }
-        return sendtables
-}
-func parseServerClassInfo(reader *bitreader.ReaderType) []ServerClassInfo {
-        var serverclassinfo []ServerClassInfo
-        numofclasses := reader.TryReadInt16()
-        fmt.Println(numofclasses)
-        for i := 0; i < int(numofclasses); i++ {
-                serverclassinfo = append(serverclassinfo, ServerClassInfo{
-                        ClassId:       int16(reader.TryReadInt16()),
-                        ClassName:     reader.TryReadString(),
-                        DataTableName: reader.TryReadString(),
-                })
-        }
-        return serverclassinfo
-}
diff --git a/packets/classes/stringtable.go b/packets/classes/stringtable.go
deleted file mode 100644
index a1432f9..0000000
--- a/packets/classes/stringtable.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package classes
-
-import (
-        "bytes"
-
-        "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
-        numOfTables := reader.TryReadInt8()
-        for i := 0; i < int(numOfTables); i++ {
-                var stringTable StringTable
-                stringTable.TableName = reader.TryReadString()
-                stringTable.NumOfEntries = int16(reader.TryReadInt16())
-                stringTable.EntryName = reader.TryReadString()
-                if reader.TryReadBool() {
-                        stringTable.EntrySize = int16(reader.TryReadInt16())
-                }
-                if reader.TryReadBool() {
-                        stringTable.EntryData = reader.TryReadBytesToSlice(int(stringTable.EntrySize))
-                }
-                if reader.TryReadBool() {
-                        stringTable.NumOfClientEntries = int16(reader.TryReadInt16())
-                }
-                if reader.TryReadBool() {
-                        stringTable.ClientEntryName = reader.TryReadString()
-                }
-                if reader.TryReadBool() {
-                        stringTable.ClientEntrySize = int16(reader.TryReadInt16())
-                }
-                if reader.TryReadBool() {
-                        stringTable.ClientEntryData = reader.TryReadBytesToSlice(int(stringTable.ClientEntrySize))
-                }
-                stringTables = append(stringTables, stringTable)
-        }
-        return stringTables
-}
diff --git a/packets/header.go b/packets/header.go
deleted file mode 100644
index c4172d9..0000000
--- a/packets/header.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package packets
-
-import (
-        "fmt"
-
-        "github.com/pektezol/bitreader"
-)
-
-func ParseHeader(reader *bitreader.ReaderType) {
-        header := Header{
-                DemoFileStamp:   reader.TryReadStringLen(8),
-                DemoProtocol:    uint32(reader.TryReadInt32()),
-                NetworkProtocol: uint32(reader.TryReadInt32()),
-                ServerName:      reader.TryReadStringLen(260),
-                ClientName:      reader.TryReadStringLen(260),
-                MapName:         reader.TryReadStringLen(260),
-                GameDirectory:   reader.TryReadStringLen(260),
-                PlaybackTime:    reader.TryReadFloat32(),
-                PlaybackTicks:   int32(reader.TryReadInt32()),
-                PlaybackFrames:  int32(reader.TryReadInt32()),
-                SignOnLength:    uint32(reader.TryReadInt32()),
-        }
-        if header.DemoFileStamp != "HL2DEMO" {
-                panic("Invalid demo file stamp. Make sure a valid demo file is given.")
-        }
-        if header.DemoProtocol != 4 {
-                panic("Given demo is from old engine. This parser is only supported for new engine.")
-        }
-        if header.NetworkProtocol != 2001 {
-                panic("Given demo is not from Portal2. This parser currently only supports Portal 2.")
-        }
-        fmt.Println(header)
-}
diff --git a/packets/messages/message.go b/packets/messages/message.go
deleted file mode 100644
index 4a00212..0000000
--- a/packets/messages/message.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package messages
-
-import (
-        "bytes"
-
-        "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/packets/messages/types"
-)
-
-func ParseMessage(data []byte) []Message {
-        reader := bitreader.Reader(bytes.NewReader(data), true)
-        var messages []Message
-        for {
-                messageType, err := reader.ReadBits(6)
-                if err != nil {
-                        break
-                }
-                switch messageType {
-                case 0:
-                        messages = append(messages, Message{Data: types.NetNop{}})
-                case 1:
-                        messages = append(messages, Message{Data: types.ParseNetDisconnect(reader)})
-                case 2:
-                        messages = append(messages, Message{Data: types.ParseNetFile(reader)})
-                case 3:
-                        messages = append(messages, Message{Data: types.ParseNetSplitScreenUser(reader)})
-                case 4:
-                        messages = append(messages, Message{Data: types.ParseNetTick(reader)})
-                case 5:
-                        messages = append(messages, Message{Data: types.ParseNetStringCmd(reader)})
-                case 6:
-                        messages = append(messages, Message{Data: types.ParseNetSetConVar(reader)})
-                case 7:
-                        messages = append(messages, Message{Data: types.ParseNetSignOnState(reader)})
-                case 8:
-                        messages = append(messages, Message{Data: types.ParseSvcServerInfo(reader)})
-                case 9:
-                        messages = append(messages, Message{Data: types.ParseSvcSendTable(reader)})
-                case 10:
-                        messages = append(messages, Message{Data: types.ParseSvcClassInfo(reader)})
-                case 11:
-                        messages = append(messages, Message{Data: types.ParseSvcSetPause(reader)})
-                case 12:
-                        messages = append(messages, Message{Data: types.ParseSvcCreateStringTable(reader)})
-                case 13:
-                        messages = append(messages, Message{Data: types.ParseSvcUpdateStringTable(reader)})
-                case 14:
-                        messages = append(messages, Message{Data: types.ParseSvcVoiceInit(reader)})
-                case 15:
-                        messages = append(messages, Message{Data: types.ParseSvcVoiceData(reader)})
-                case 16:
-                        messages = append(messages, Message{Data: types.ParseSvcPrint(reader)})
-                case 17:
-                        messages = append(messages, Message{Data: types.ParseSvcSounds(reader)})
-                case 18:
-                        messages = append(messages, Message{Data: types.ParseSvcSetView(reader)})
-                case 19:
-                        messages = append(messages, Message{Data: types.ParseSvcFixAngle(reader)})
-                case 20:
-                        messages = append(messages, Message{Data: types.ParseSvcCrosshairAngle(reader)})
-                case 21:
-                        // TODO: SvcBspDecal
-                case 22:
-                        messages = append(messages, Message{Data: types.ParseSvcSplitScreen(reader)})
-                case 23:
-                        messages = append(messages, Message{Data: types.ParseSvcUserMessage(reader)})
-                case 24:
-                        messages = append(messages, Message{Data: types.ParseSvcEntityMessage(reader)})
-                case 25:
-                        messages = append(messages, Message{Data: types.ParseSvcGameEvent(reader)})
-                case 26:
-                        messages = append(messages, Message{Data: types.ParseSvcPacketEntities(reader)})
-                case 27:
-                        messages = append(messages, Message{Data: types.ParseSvcTempEntities(reader)})
-                case 28:
-                        messages = append(messages, Message{Data: types.ParseSvcPrefetch(reader)})
-                case 29:
-                        messages = append(messages, Message{Data: types.ParseSvcMenu(reader)})
-                case 30:
-                        messages = append(messages, Message{Data: types.ParseSvcGameEventList(reader)})
-                case 31:
-                        messages = append(messages, Message{Data: types.ParseSvcGetCvarValue(reader)})
-                case 32:
-                        messages = append(messages, Message{Data: types.ParseSvcCmdKeyValues(reader)})
-                case 33:
-                        messages = append(messages, Message{Data: types.ParseSvcPaintmapData(reader)})
-                }
-        }
-        return messages
-}
-
-type Message struct {
-        Data any
-}
diff --git a/packets/messages/types/NetNop.go b/packets/messages/types/NetNop.go
deleted file mode 100644
index d0a1f7a..0000000
--- a/packets/messages/types/NetNop.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package types
-
-type NetNop struct{}
diff --git a/packets/messages/types/NetSignOnState.go b/packets/messages/types/NetSignOnState.go
deleted file mode 100644
index a8f3add..0000000
--- a/packets/messages/types/NetSignOnState.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package types
-
-import (
-        "github.com/pektezol/bitreader"
-)
-
-type NetSignOnState struct {
-        SignonState       int8
-        SpawnCount        uint32
-        NumServerPlayers  uint32
-        PlayersNetworkIds []byte
-        MapNameLength     uint32
-        MapName           string
-}
-
-func ParseNetSignOnState(reader *bitreader.ReaderType) NetSignOnState {
-        netsignonstate := NetSignOnState{
-                SignonState:      int8(reader.TryReadInt8()),
-                SpawnCount:       reader.TryReadInt32(),
-                NumServerPlayers: reader.TryReadInt32(),
-        }
-        length := reader.TryReadInt32()
-        netsignonstate.PlayersNetworkIds = reader.TryReadBytesToSlice(int(length))
-        netsignonstate.MapNameLength = reader.TryReadInt32()
-        netsignonstate.MapName = reader.TryReadStringLen(int(netsignonstate.MapNameLength))
-        return netsignonstate
-}
diff --git a/packets/messages/types/NetTick.go b/packets/messages/types/NetTick.go
deleted file mode 100644
index 9dae14b..0000000
--- a/packets/messages/types/NetTick.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type NetTick struct {
-        Tick                      uint32
-        HostFrameTime             float32
-        HostFrameTimeStdDeviation float32
-}
-
-func ParseNetTick(reader *bitreader.ReaderType) NetTick {
-        return NetTick{
-                Tick:                      reader.TryReadInt32(),
-                HostFrameTime:             float32(reader.TryReadInt16()) / 1e5,
-                HostFrameTimeStdDeviation: float32(reader.TryReadInt16()) / 1e5,
-        }
-}
diff --git a/packets/messages/types/SvcClassInfo.go b/packets/messages/types/SvcClassInfo.go
deleted file mode 100644
index df17bfc..0000000
--- a/packets/messages/types/SvcClassInfo.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package types
-
-import (
-        "github.com/pektezol/bitreader"
-)
-
-type SvcClassInfo struct {
-        CreateOnClient bool
-        ServerClasses  []ServerClass
-}
-
-type ServerClass struct {
-        ClassId       int32
-        ClassName     string
-        DataTableName string
-}
-
-func ParseSvcClassInfo(reader *bitreader.ReaderType) SvcClassInfo {
-        length := reader.TryReadInt16()
-        createonclient := reader.TryReadBool()
-        var serverclasses []ServerClass
-        if !createonclient {
-                serverclasses := make([]ServerClass, length)
-                for i := 0; i < int(length); i++ {
-                        id, err := reader.ReadBits(HighestBitIndex(uint(length)) + 1)
-                        if err != nil {
-                                panic(err)
-                        }
-                        serverclasses[i] = ServerClass{
-                                ClassId:       int32(id),
-                                ClassName:     reader.TryReadString(),
-                                DataTableName: reader.TryReadString(),
-                        }
-                }
-        }
-        return SvcClassInfo{
-                CreateOnClient: createonclient,
-                ServerClasses:  serverclasses,
-        }
-}
-
-func HighestBitIndex(i uint) int {
-        var j int
-        for j = 31; j >= 0 && (i&(1<<j)) == 0; j-- {
-        }
-        return j
-}
diff --git a/packets/messages/types/SvcCmdKeyValues.go b/packets/messages/types/SvcCmdKeyValues.go
deleted file mode 100644
index 06504a2..0000000
--- a/packets/messages/types/SvcCmdKeyValues.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcCmdKeyValues struct {
-        Data []byte
-}
-
-func ParseSvcCmdKeyValues(reader *bitreader.ReaderType) SvcCmdKeyValues {
-        length := reader.TryReadInt32()
-        return SvcCmdKeyValues{
-                Data: reader.TryReadBytesToSlice(int(length)),
-        }
-}
diff --git a/packets/messages/types/SvcCreateStringTable.go b/packets/messages/types/SvcCreateStringTable.go
deleted file mode 100644
index 72ab1a7..0000000
--- a/packets/messages/types/SvcCreateStringTable.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package types
-
-import (
-        "github.com/pektezol/bitreader"
-)
-
-type SvcCreateStringTable struct {
-        Name              string
-        MaxEntries        uint16
-        NumEntries        uint8
-        UserDataFixedSize bool
-        UserDataSize      uint16
-        UserDataSizeBits  uint8
-        Flags             uint8
-        StringData        []byte
-}
-
-func ParseSvcCreateStringTable(reader *bitreader.ReaderType) SvcCreateStringTable {
-        svccreatestringtable := SvcCreateStringTable{
-                Name:       reader.TryReadString(),
-                MaxEntries: reader.TryReadInt16(),
-        }
-        svccreatestringtable.NumEntries = uint8(reader.TryReadBits(HighestBitIndex(uint(svccreatestringtable.MaxEntries)) + 1))
-        length := reader.TryReadBits(20)
-        svccreatestringtable.UserDataFixedSize = reader.TryReadBool()
-        if svccreatestringtable.UserDataFixedSize {
-                svccreatestringtable.UserDataSize = uint16(reader.TryReadBits(12))
-                svccreatestringtable.UserDataSizeBits = uint8(reader.TryReadBits(4))
-        }
-        svccreatestringtable.Flags = uint8(reader.TryReadBits(2))
-        svccreatestringtable.StringData = reader.TryReadBitsToSlice(int(length))
-        return svccreatestringtable
-
-}
diff --git a/packets/messages/types/SvcEntityMessage.go b/packets/messages/types/SvcEntityMessage.go
deleted file mode 100644
index f4fb518..0000000
--- a/packets/messages/types/SvcEntityMessage.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcEntityMessage struct {
-        EntityIndex int16
-        ClassId     int16
-        Data        []byte
-}
-
-func ParseSvcEntityMessage(reader *bitreader.ReaderType) SvcEntityMessage {
-        entityindex := reader.TryReadBits(11)
-        classid := reader.TryReadBits(9)
-        length := reader.TryReadBits(11)
-        return SvcEntityMessage{
-                EntityIndex: int16(entityindex),
-                ClassId:     int16(classid),
-                Data:        reader.TryReadBytesToSlice(int(length / 8)),
-        }
-}
diff --git a/packets/messages/types/SvcFixAngle.go b/packets/messages/types/SvcFixAngle.go
deleted file mode 100644
index d98dedd..0000000
--- a/packets/messages/types/SvcFixAngle.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcFixAngle struct {
-        Relative bool
-        Angle    []int16
-}
-
-func ParseSvcFixAngle(reader *bitreader.ReaderType) SvcFixAngle {
-        relative := reader.TryReadBool()
-        angles := []int16{
-                int16(reader.TryReadInt16()),
-                int16(reader.TryReadInt16()),
-                int16(reader.TryReadInt16()),
-        }
-        return SvcFixAngle{
-                Relative: relative,
-                Angle:    angles,
-        }
-}
diff --git a/packets/messages/types/SvcGameEvent.go b/packets/messages/types/SvcGameEvent.go
deleted file mode 100644
index 1d6b0ea..0000000
--- a/packets/messages/types/SvcGameEvent.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package types
-
-import (
-        "github.com/pektezol/bitreader"
-)
-
-type SvcGameEvent struct {
-        Data []byte
-}
-
-func ParseSvcGameEvent(reader *bitreader.ReaderType) SvcGameEvent {
-        length := reader.TryReadBits(11)
-        reader.SkipBits(int(length))
-        return SvcGameEvent{} // TODO: Parse SvcGameEvent
-}
diff --git a/packets/messages/types/SvcGameEventList.go b/packets/messages/types/SvcGameEventList.go
deleted file mode 100644
index fea0be4..0000000
--- a/packets/messages/types/SvcGameEventList.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcGameEventList struct {
-        Events int16
-        Data   []byte
-}
-
-func ParseSvcGameEventList(reader *bitreader.ReaderType) SvcGameEventList {
-        events := reader.TryReadBits(9)
-        length := reader.TryReadBits(20)
-        return SvcGameEventList{
-                Events: int16(events),
-                Data:   reader.TryReadBitsToSlice(int(length)),
-        }
-}
diff --git a/packets/messages/types/SvcMenu.go b/packets/messages/types/SvcMenu.go
deleted file mode 100644
index 312115a..0000000
--- a/packets/messages/types/SvcMenu.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcMenu struct {
-        MenuType int16
-        Data     []byte
-}
-
-func ParseSvcMenu(reader *bitreader.ReaderType) SvcMenu {
-        menutype := reader.TryReadInt16()
-        length := reader.TryReadInt32()
-        return SvcMenu{
-                MenuType: int16(menutype),
-                Data:     reader.TryReadBytesToSlice(int(length / 8)),
-        }
-}
diff --git a/packets/messages/types/SvcPacketEntities.go b/packets/messages/types/SvcPacketEntities.go
deleted file mode 100644
index 9d8a8b0..0000000
--- a/packets/messages/types/SvcPacketEntities.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package types
-
-import (
-        "github.com/pektezol/bitreader"
-)
-
-type SvcPacketEntities struct {
-        MaxEntries     uint16
-        IsDelta        bool
-        DeltaFrom      int32
-        BaseLine       bool
-        UpdatedEntries uint16
-        UpdateBaseline bool
-        Data           []byte
-}
-
-func ParseSvcPacketEntities(reader *bitreader.ReaderType) SvcPacketEntities {
-        maxentries := reader.TryReadBits(11)
-        isdelta := reader.TryReadBool()
-        var deltafrom int32
-        if isdelta {
-                deltafrom = int32(reader.TryReadInt32())
-        } else {
-                deltafrom = -1
-        }
-        baseline := reader.TryReadBool()
-        updatedentries := reader.TryReadBits(11)
-        length := reader.TryReadBits(20)
-        updatebaseline := reader.TryReadBool()
-        return SvcPacketEntities{
-                MaxEntries:     uint16(maxentries),
-                IsDelta:        isdelta,
-                DeltaFrom:      deltafrom,
-                BaseLine:       baseline,
-                UpdatedEntries: uint16(updatedentries),
-                UpdateBaseline: updatebaseline,
-                Data:           reader.TryReadBitsToSlice(int(length)),
-        }
-}
diff --git a/packets/messages/types/SvcPaintmapData.go b/packets/messages/types/SvcPaintmapData.go
deleted file mode 100644
index f3bd1a3..0000000
--- a/packets/messages/types/SvcPaintmapData.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcPaintmapData struct {
-        Data []byte
-}
-
-func ParseSvcPaintmapData(reader *bitreader.ReaderType) SvcPaintmapData {
-        length := reader.TryReadInt32()
-        return SvcPaintmapData{
-                Data: reader.TryReadBytesToSlice(int(length / 8)),
-        }
-}
diff --git a/packets/messages/types/SvcSendTable.go b/packets/messages/types/SvcSendTable.go
deleted file mode 100644
index f76aadb..0000000
--- a/packets/messages/types/SvcSendTable.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcSendTable struct {
-        NeedsDecoder bool
-        Length       uint8
-        Props        int32
-}
-
-func ParseSvcSendTable(reader *bitreader.ReaderType) SvcSendTable {
-        return SvcSendTable{
-                NeedsDecoder: reader.TryReadBool(),
-                Length:       reader.TryReadInt8(),
-        }
-        // No one cares about SvcSendTable
-}
diff --git a/packets/messages/types/SvcServerInfo.go b/packets/messages/types/SvcServerInfo.go
deleted file mode 100644
index 9d2648b..0000000
--- a/packets/messages/types/SvcServerInfo.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcServerInfo struct {
-        Protocol     uint16
-        ServerCount  uint32
-        IsHltv       bool
-        IsDedicated  bool
-        ClientCrc    int32
-        MaxClasses   uint16
-        MapCrc       uint32
-        PlayerSlot   uint8
-        MaxClients   uint8
-        Unk          uint32
-        TickInterval float32
-        COs          byte
-        GameDir      string
-        MapName      string
-        SkyName      string
-        HostName     string
-}
-
-func ParseSvcServerInfo(reader *bitreader.ReaderType) SvcServerInfo {
-        return SvcServerInfo{
-                Protocol:     reader.TryReadInt16(),
-                ServerCount:  reader.TryReadInt32(),
-                IsHltv:       reader.TryReadBool(),
-                IsDedicated:  reader.TryReadBool(),
-                ClientCrc:    int32(reader.TryReadInt32()),
-                MaxClasses:   reader.TryReadInt16(),
-                MapCrc:       reader.TryReadInt32(),
-                PlayerSlot:   reader.TryReadInt8(),
-                MaxClients:   reader.TryReadInt8(),
-                Unk:          reader.TryReadInt32(),
-                TickInterval: reader.TryReadFloat32(),
-                COs:          reader.TryReadInt8(),
-                GameDir:      reader.TryReadString(),
-                MapName:      reader.TryReadString(),
-                SkyName:      reader.TryReadString(),
-                HostName:     reader.TryReadString(),
-        }
-}
diff --git a/packets/messages/types/SvcSounds.go b/packets/messages/types/SvcSounds.go
deleted file mode 100644
index 2dc7974..0000000
--- a/packets/messages/types/SvcSounds.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcSounds struct {
-        ReliableSound bool
-        Size          int8
-        Data          []byte
-}
-
-func ParseSvcSounds(reader *bitreader.ReaderType) SvcSounds {
-        reliablesound := reader.TryReadBool()
-        var size int8
-        var length int16
-        if reliablesound {
-                size = 1
-        } else {
-                size = int8(reader.TryReadInt8())
-        }
-        if reliablesound {
-                length = int16(reader.TryReadInt8())
-        } else {
-                length = int16(reader.TryReadInt16())
-        }
-        return SvcSounds{
-                ReliableSound: reliablesound,
-                Size:          size,
-                Data:          reader.TryReadBitsToSlice(int(length)),
-        }
-}
diff --git a/packets/messages/types/SvcSplitScreen.go b/packets/messages/types/SvcSplitScreen.go
deleted file mode 100644
index 6727558..0000000
--- a/packets/messages/types/SvcSplitScreen.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcSplitScreen struct {
-        Unk  bool
-        Data []byte
-}
-
-func ParseSvcSplitScreen(reader *bitreader.ReaderType) SvcSplitScreen {
-        unk := reader.TryReadBool()
-        length := reader.TryReadBits(11)
-        return SvcSplitScreen{
-                Unk:  unk,
-                Data: reader.TryReadBytesToSlice(int(length / 8)),
-        }
-}
diff --git a/packets/messages/types/SvcTempEntities.go b/packets/messages/types/SvcTempEntities.go
deleted file mode 100644
index 3bfae0c..0000000
--- a/packets/messages/types/SvcTempEntities.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package types
-
-import (
-        "github.com/pektezol/bitreader"
-)
-
-type SvcTempEntities struct {
-        NumEntries uint8
-        Data       []byte
-}
-
-func ParseSvcTempEntities(reader *bitreader.ReaderType) SvcTempEntities {
-        numentries := reader.TryReadInt8()
-        length := reader.TryReadBits(17)
-        //reader.SkipBits(int(length)) // TODO: Read data properly
-        return SvcTempEntities{
-                NumEntries: numentries,
-                Data:       reader.TryReadBitsToSlice(int(length)),
-        }
-}
diff --git a/packets/messages/types/SvcUpdateStringTable.go b/packets/messages/types/SvcUpdateStringTable.go
deleted file mode 100644
index 9f178a5..0000000
--- a/packets/messages/types/SvcUpdateStringTable.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcUpdateStringTable struct {
-        TableId           int8
-        NumChangedEntries int16
-        Data              []byte
-}
-
-func ParseSvcUpdateStringTable(reader *bitreader.ReaderType) SvcUpdateStringTable {
-        svcupdatestringtable := SvcUpdateStringTable{
-                TableId: int8(reader.TryReadBits(5)),
-        }
-        if reader.TryReadBool() {
-                svcupdatestringtable.NumChangedEntries = int16(reader.TryReadInt16())
-        }
-        length := reader.TryReadBits(20)
-        svcupdatestringtable.Data = reader.TryReadBitsToSlice(int(length))
-        return svcupdatestringtable
-}
diff --git a/packets/messages/types/SvcUserMessage.go b/packets/messages/types/SvcUserMessage.go
deleted file mode 100644
index c7b0566..0000000
--- a/packets/messages/types/SvcUserMessage.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package types
-
-import (
-        "github.com/pektezol/bitreader"
-)
-
-type SvcUserMessage struct {
-        MsgType uint8
-        Data    []byte
-}
-
-func ParseSvcUserMessage(reader *bitreader.ReaderType) SvcUserMessage {
-        msgtype := reader.TryReadInt8()
-        length := reader.TryReadBits(12)
-        return SvcUserMessage{
-                MsgType: msgtype,
-                Data:    reader.TryReadBitsToSlice(int(length)),
-        }
-}
diff --git a/packets/messages/types/SvcVoiceData.go b/packets/messages/types/SvcVoiceData.go
deleted file mode 100644
index f99db38..0000000
--- a/packets/messages/types/SvcVoiceData.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package types
-
-import "github.com/pektezol/bitreader"
-
-type SvcVoiceData struct {
-        Client    int8
-        Proximity int8
-        Data      []byte
-}
-
-func ParseSvcVoiceData(reader *bitreader.ReaderType) SvcVoiceData {
-        svcvoicedata := SvcVoiceData{
-                Client:    int8(reader.TryReadInt8()),
-                Proximity: int8(reader.TryReadInt8()),
-        }
-        length := reader.TryReadInt16()
-        svcvoicedata.Data = reader.TryReadBytesToSlice(int(length / 8))
-        return svcvoicedata
-}
diff --git a/packets/packet.go b/packets/packet.go
deleted file mode 100644
index 8f4a262..0000000
--- a/packets/packet.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package packets
-
-import (
-        "fmt"
-
-        "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/packets/classes"
-        "github.com/pektezol/demoparser/packets/messages"
-)
-
-const MSSC = 2
-
-func ParsePacket(reader *bitreader.ReaderType) (status int) {
-        messageType := reader.TryReadInt8()
-        messageTick := reader.TryReadInt32()
-        messageSlot := reader.TryReadInt8()
-        _ = messageSlot
-        switch messageType {
-        case 1:
-                signOn := SignOn{
-                        PacketInfo:  classes.ParseCmdInfo(reader, MSSC),
-                        InSequence:  int32(reader.TryReadInt32()),
-                        OutSequence: int32(reader.TryReadInt32()),
-                }
-                size := int(reader.TryReadInt32())
-                signOn.Data = messages.ParseMessage(reader.TryReadBytesToSlice(size))
-                // fmt.Printf("[%d] (%d) {%d} SignOn: %v\n", messageTick, messageType, messageSlot, signOn)
-                return 1
-        case 2:
-                packet := Packet{
-                        PacketInfo:  classes.ParseCmdInfo(reader, MSSC),
-                        InSequence:  int32(reader.TryReadInt32()),
-                        OutSequence: int32(reader.TryReadInt32()),
-                }
-                size := int(reader.TryReadInt32())
-                packet.Data = messages.ParseMessage(reader.TryReadBytesToSlice(size))
-                // fmt.Printf("[%d] (%d) Packet: %v\n", messageTick, messageType, packet)
-                return 2
-        case 3:
-                syncTick := SyncTick{}
-                fmt.Printf("[%d] (%d) SyncTick: %v\n", messageTick, messageType, syncTick)
-                return 3
-        case 4:
-                size := int(reader.TryReadInt32())
-                var consoleCmd ConsoleCmd
-                consoleCmd.Data = reader.TryReadStringLen(size)
-                // fmt.Printf("[%d] (%d) ConsoleCmd: %s\n", messageTick, messageType, consoleCmd.Data)
-                return 4
-        case 5: // TODO: UserCmd - Buttons
-                userCmd := UserCmd{
-                        Cmd: int32(reader.TryReadInt32()),
-                }
-                size := int(reader.TryReadInt32())
-                userCmd.Data = classes.ParseUserCmdInfo(reader.TryReadBytesToSlice(size))
-                // fmt.Printf("[%d] (%d) UserCmd: %v\n", messageTick, messageType, userCmd)
-                return 5
-        case 6: // TODO: DataTables
-                // datatables := DataTables{
-                //      Size: int32(reader.TryReadInt32()),
-                // }
-                size := int(reader.TryReadInt32())
-                reader.SkipBytes(size)
-                // datatables.Data = classes.ParseDataTable(reader.TryReadBytesToSlice(int(datatables.Size)))
-                // fmt.Printf("[%d] (%d) DataTables: %v\n", messageTick, messageType, datatables)
-                return 6
-        case 7:
-                stop := Stop{
-                        RemainingData: nil,
-                }
-                fmt.Printf("[%d] (%d) Stop: %v\n", messageTick, messageType, stop)
-                return 7
-        case 8: // TODO: CustomData
-                reader.SkipBytes(4)
-                size := int(reader.TryReadInt32())
-                reader.SkipBytes(size)
-                // fmt.Printf("[%d] (%d) CustomData: \n", messageTick, messageType)
-                return 8
-        case 9: // TODO: StringTables - Data
-                var stringTables StringTables
-                size := int(reader.TryReadInt32())
-                stringTables.Data = classes.ParseStringTable(reader.TryReadBytesToSlice(size))
-                // fmt.Printf("[%d] (%d) StringTables: %v\n", messageTick, messageType, stringTables)
-                return 9
-        default:
-                return 0
-        }
-}
diff --git a/pkg/classes/cmdInfo.go b/pkg/classes/cmdInfo.go
new file mode 100644
index 0000000..6e56c41
--- /dev/null
+++ b/pkg/classes/cmdInfo.go
@@ -0,0 +1,27 @@
+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) CmdInfo {
+        return CmdInfo{
+                Flags:            int32(reader.TryReadBits(32)),
+                ViewOrigin:       []float32{reader.TryReadFloat32(), reader.TryReadFloat32(), reader.TryReadFloat32()},
+                ViewAngles:       []float32{reader.TryReadFloat32(), reader.TryReadFloat32(), reader.TryReadFloat32()},
+                LocalViewAngles:  []float32{reader.TryReadFloat32(), reader.TryReadFloat32(), reader.TryReadFloat32()},
+                ViewOrigin2:      []float32{reader.TryReadFloat32(), reader.TryReadFloat32(), reader.TryReadFloat32()},
+                ViewAngles2:      []float32{reader.TryReadFloat32(), reader.TryReadFloat32(), reader.TryReadFloat32()},
+                LocalViewAngles2: []float32{reader.TryReadFloat32(), reader.TryReadFloat32(), reader.TryReadFloat32()},
+        }
+}
diff --git a/pkg/classes/sendTable.go b/pkg/classes/sendTable.go
new file mode 100644
index 0000000..4521464
--- /dev/null
+++ b/pkg/classes/sendTable.go
@@ -0,0 +1,106 @@
+package classes
+
+import (
+        "github.com/pektezol/bitreader"
+)
+
+type SendTable struct {
+        NeedsDecoder bool
+        NetTableName string
+        NumOfProps   int16
+        Props        []prop
+}
+
+type prop struct {
+        SendPropType  int8
+        SendPropName  string
+        SendPropFlags int32
+        Priority      int8
+        ExcludeDtName string
+        LowValue      float32
+        HighValue     float32
+        NumBits       int32
+        NumElements   int32
+}
+
+type sendPropFlag int
+
+const (
+        Unsigned sendPropFlag = iota
+        Coord
+        NoScale
+        RoundDown
+        RoundUp
+        Normal
+        Exclude
+        Xyze
+        InsideArray
+        ProxyAlwaysYes
+        IsVectorElem
+        Collapsible
+        CoordMp
+        CoordMpLp // low precision
+        CoordMpInt
+        CellCoord
+        CellCoordLp
+        CellCoordInt
+        ChangesOften
+)
+
+type sendPropType int
+
+const (
+        Int sendPropType = iota
+        Float
+        Vector3
+        Vector2
+        String
+        Array
+        DataTable
+)
+
+func ParseSendTable(reader *bitreader.ReaderType) SendTable {
+        sendTable := SendTable{
+                NeedsDecoder: reader.TryReadBool(),
+                NetTableName: reader.TryReadString(),
+                NumOfProps:   int16(reader.TryReadBits(10)),
+                // SendPropType:  int8(reader.TryReadBits(5)),
+                // SendPropName:  reader.TryReadString(),
+                // SendPropFlags: int16(reader.TryReadBits(16)),
+        }
+        if sendTable.NumOfProps < 0 {
+                return sendTable
+        }
+        for count := 0; count < int(sendTable.NumOfProps); count++ {
+                propType := int8(reader.TryReadBits(5))
+                if propType >= int8(7) {
+                        return sendTable
+                }
+                prop := prop{
+                        SendPropType:  propType,
+                        SendPropName:  reader.TryReadString(),
+                        SendPropFlags: int32(reader.TryReadBits(19)),
+                        Priority:      int8(reader.TryReadBits(8)),
+                }
+                if propType == int8(DataTable) || CheckBit(int64(prop.SendPropFlags), int(Exclude)) {
+                        prop.ExcludeDtName = reader.TryReadString()
+                } else {
+                        switch propType {
+                        case int8(String), int8(Int), int8(Float), int8(Vector3), int8(Vector2):
+                                prop.LowValue = reader.TryReadFloat32()
+                                prop.HighValue = reader.TryReadFloat32()
+                                prop.NumBits = int32(reader.TryReadBits(7))
+                        case int8(Array):
+                                prop.NumElements = int32(reader.TryReadBits(10))
+                        default:
+                                return sendTable
+                        }
+                }
+                sendTable.Props = append(sendTable.Props, prop)
+        }
+        return sendTable
+}
+
+func CheckBit(val int64, bit int) bool {
+        return (val & (int64(1) << bit)) != 0
+}
diff --git a/pkg/classes/serverClassInfo.go b/pkg/classes/serverClassInfo.go
new file mode 100644
index 0000000..c60dad1
--- /dev/null
+++ b/pkg/classes/serverClassInfo.go
@@ -0,0 +1,30 @@
+package classes
+
+import (
+        "github.com/pektezol/bitreader"
+)
+
+type ServerClassInfo struct {
+        ClassId       int16
+        ClassName     string
+        DataTableName string
+}
+
+func ParseServerClassInfo(reader *bitreader.ReaderType, count int, numOfClasses int) ServerClassInfo {
+        return ServerClassInfo{
+                ClassId:       int16(reader.TryReadBits(16)),
+                ClassName:     reader.TryReadString(),
+                DataTableName: reader.TryReadString(),
+        }
+}
+
+// func serverClassBits(numOfClasses int) int {
+//      return highestBitIndex(uint(numOfClasses)) + 1
+// }
+
+// func highestBitIndex(i uint) int {
+//      var j int
+//      for j = 31; j >= 0 && (i&(1<<j)) == 0; j-- {
+//      }
+//      return j
+// }
diff --git a/pkg/classes/stringTable.go b/pkg/classes/stringTable.go
new file mode 100644
index 0000000..c6709f5
--- /dev/null
+++ b/pkg/classes/stringTable.go
@@ -0,0 +1,82 @@
+package classes
+
+import (
+        "bytes"
+
+        "github.com/pektezol/bitreader"
+)
+
+type StringTable struct {
+        Name         string
+        TableEntries []StringTableEntry
+        Classes      []StringTableClass
+}
+
+type StringTableEntry struct {
+        Name      string
+        EntryData StringTableEntryData
+}
+
+type StringTableEntryData struct {
+        // TODO: Parse StringTableEntry
+}
+
+type StringTableClass struct {
+        Name string
+        Data string
+}
+
+func ParseStringTables(reader *bitreader.ReaderType) []StringTable {
+        tableCount := reader.TryReadBits(8)
+        stringTables := make([]StringTable, tableCount)
+        for i := 0; i < int(tableCount); i++ {
+                var table StringTable
+                table.ParseStream(reader)
+                stringTables[i] = table
+        }
+        return stringTables
+}
+
+func (stringTable *StringTable) ParseStream(reader *bitreader.ReaderType) {
+        stringTable.Name = reader.TryReadString()
+        entryCount := reader.TryReadBits(16)
+        stringTable.TableEntries = make([]StringTableEntry, entryCount)
+
+        for i := 0; i < int(entryCount); i++ {
+                var entry StringTableEntry
+                entry.Parse(reader)
+                stringTable.TableEntries[i] = entry
+        }
+
+        if reader.TryReadBool() {
+                classCount := reader.TryReadBits(16)
+                stringTable.Classes = make([]StringTableClass, classCount)
+
+                for i := 0; i < int(classCount); i++ {
+                        var class StringTableClass
+                        class.Parse(reader)
+                        stringTable.Classes[i] = class
+                }
+        }
+}
+
+func (stringTableEntry *StringTableEntry) Parse(reader *bitreader.ReaderType) {
+        stringTableEntry.Name = reader.TryReadString()
+        if reader.TryReadBool() {
+                byteLen, err := reader.ReadBits(16)
+                if err != nil {
+                        return
+                }
+                dataBsr := reader.TryReadBytesToSlice(int(byteLen))
+                _ = bitreader.Reader(bytes.NewReader(dataBsr), true) // TODO: Parse StringTableEntry
+                // stringTableEntry.EntryData.ParseStream(entryReader)
+        }
+}
+
+func (stringTableClass *StringTableClass) Parse(reader *bitreader.ReaderType) {
+        stringTableClass.Name = reader.TryReadString()
+        if reader.TryReadBool() {
+                dataLen := reader.TryReadBits(16)
+                stringTableClass.Data = reader.TryReadStringLen(int(dataLen))
+        }
+}
diff --git a/packets/classes/usercmd.go b/pkg/classes/userCmdInfo.go
index d3328fd..a6d9091 100644
--- a/packets/classes/usercmd.go
+++ b/pkg/classes/userCmdInfo.go
@@ -16,21 +16,21 @@ type UserCmdInfo struct {
         SideMove      float32
         UpMove        float32
         Buttons       int32
-        Impulse       byte
-        WeaponSelect  int
-        WeaponSubtype int
+        Impulse       int8
+        WeaponSelect  int16
+        WeaponSubType int8
         MouseDx       int16
         MouseDy       int16
 }
 
 func ParseUserCmdInfo(data []byte) UserCmdInfo {
         reader := bitreader.Reader(bytes.NewReader(data), true)
-        var userCmdInfo UserCmdInfo
+        userCmdInfo := UserCmdInfo{}
         if reader.TryReadBool() {
-                userCmdInfo.CommandNumber = int32(reader.TryReadInt32())
+                userCmdInfo.CommandNumber = int32(reader.TryReadBits(32))
         }
         if reader.TryReadBool() {
-                userCmdInfo.TickCount = int32(reader.TryReadInt32())
+                userCmdInfo.TickCount = int32(reader.TryReadBits(32))
         }
         if reader.TryReadBool() {
                 userCmdInfo.ViewAnglesX = reader.TryReadFloat32()
@@ -51,30 +51,22 @@ func ParseUserCmdInfo(data []byte) UserCmdInfo {
                 userCmdInfo.UpMove = reader.TryReadFloat32()
         }
         if reader.TryReadBool() {
-                userCmdInfo.Buttons = int32(reader.TryReadInt32())
+                userCmdInfo.Buttons = int32(reader.TryReadBits(32))
         }
         if reader.TryReadBool() {
-                userCmdInfo.Impulse = reader.TryReadInt8()
+                userCmdInfo.Impulse = int8(reader.TryReadBits(8))
         }
         if reader.TryReadBool() {
-                value, err := reader.ReadBits(11)
-                if err != nil {
-                        panic(err)
-                }
-                userCmdInfo.WeaponSelect = int(value)
+                userCmdInfo.WeaponSelect = int16(reader.TryReadBits(11))
                 if reader.TryReadBool() {
-                        value, err := reader.ReadBits(6)
-                        if err != nil {
-                                panic(err)
-                        }
-                        userCmdInfo.WeaponSubtype = int(value)
+                        userCmdInfo.WeaponSubType = int8(reader.TryReadBits(6))
                 }
         }
         if reader.TryReadBool() {
-                userCmdInfo.MouseDx = int16(reader.TryReadInt16())
+                userCmdInfo.MouseDx = int16(reader.TryReadBits(16))
         }
         if reader.TryReadBool() {
-                userCmdInfo.MouseDy = int16(reader.TryReadInt16())
+                userCmdInfo.MouseDy = int16(reader.TryReadBits(16))
         }
         return userCmdInfo
 }
diff --git a/pkg/messages/messages.go b/pkg/messages/messages.go
new file mode 100644
index 0000000..39f89e9
--- /dev/null
+++ b/pkg/messages/messages.go
@@ -0,0 +1,87 @@
+package messages
+
+import (
+        "fmt"
+        "reflect"
+
+        "github.com/pektezol/bitreader"
+        messages "github.com/pektezol/demoparser/pkg/messages/types"
+)
+
+func ParseMessages(messageType int, reader *bitreader.ReaderType) any {
+        var messageData any
+        switch messageType {
+        case 0:
+                messageData = messages.ParseNetNop(reader)
+        case 1:
+                messageData = messages.ParseNetDisconnect(reader)
+        case 2:
+                messageData = messages.ParseNetFile(reader)
+        case 3:
+                messageData = messages.ParseNetSplitScreenUser(reader)
+        case 4:
+                messageData = messages.ParseNetTick(reader)
+        case 5:
+                messageData = messages.ParseNetStringCmd(reader)
+        case 6:
+                messageData = messages.ParseNetSetConVar(reader)
+        case 7:
+                messageData = messages.ParseNetSignOnState(reader)
+        case 8:
+                messageData = messages.ParseSvcServerInfo(reader)
+        case 9:
+                messageData = messages.ParseSvcSendTable(reader)
+        case 10:
+                messageData = messages.ParseSvcClassInfo(reader)
+        case 11:
+                messageData = messages.ParseSvcSetPause(reader)
+        case 12:
+                messageData = messages.ParseSvcCreateStringTable(reader)
+        case 13:
+                messageData = messages.ParseSvcUpdateStringTable(reader)
+        case 14:
+                messageData = messages.ParseSvcVoiceInit(reader)
+        case 15:
+                messageData = messages.ParseSvcVoiceData(reader)
+        case 16:
+                messageData = messages.ParseSvcPrint(reader)
+        case 17:
+                messageData = messages.ParseSvcSounds(reader)
+        case 18:
+                messageData = messages.ParseSvcSetView(reader)
+        case 19:
+                messageData = messages.ParseSvcFixAngle(reader)
+        case 20:
+                messageData = messages.ParseSvcCrosshairAngle(reader)
+        case 21:
+                messageData = messages.ParseSvcBspDecal(reader)
+        case 22:
+                messageData = messages.ParseSvcSplitScreen(reader)
+        case 23:
+                messageData = messages.ParseSvcUserMessage(reader)
+        case 24:
+                messageData = messages.ParseSvcEntityMessage(reader)
+        case 25:
+                messageData = messages.ParseSvcGameEvent(reader)
+        case 26:
+                messageData = messages.ParseSvcPacketEntities(reader)
+        case 27:
+                messageData = messages.ParseSvcTempEntities(reader)
+        case 28:
+                messageData = messages.ParseSvcPrefetch(reader)
+        case 29:
+                messageData = messages.ParseSvcMenu(reader)
+        case 30:
+                messageData = messages.ParseSvcGameEventList(reader)
+        case 31:
+                messageData = messages.ParseSvcGetCvarValue(reader)
+        case 32:
+                messageData = messages.ParseSvcCmdKeyValues(reader)
+        case 33:
+                messageData = messages.ParseSvcPaintmapData(reader)
+        default:
+                return nil
+        }
+        fmt.Printf("\t\t(%d) %s:\n\t\t\t%+v\n", messageType, reflect.ValueOf(messageData).Type(), messageData)
+        return messageData
+}
diff --git a/packets/messages/types/NetDisconnect.go b/pkg/messages/types/netDisconnect.go
index 8b65568..69d4a67 100644
--- a/packets/messages/types/NetDisconnect.go
+++ b/pkg/messages/types/netDisconnect.go
@@ -1,4 +1,4 @@
-package types
+package messages
 
 import "github.com/pektezol/bitreader"
 
@@ -7,5 +7,7 @@ type NetDisconnect struct {
 }
 
 func ParseNetDisconnect(reader *bitreader.ReaderType) NetDisconnect {
-        return NetDisconnect{Text: reader.TryReadString()}
+        return NetDisconnect{
+                Text: reader.TryReadString(),
+        }
 }
diff --git a/packets/messages/types/NetFile.go b/pkg/messages/types/netFile.go
index c65873d..a41a0cf 100644
--- a/packets/messages/types/NetFile.go
+++ b/pkg/messages/types/netFile.go
@@ -1,16 +1,16 @@
-package types
+package messages
 
 import "github.com/pektezol/bitreader"
 
 type NetFile struct {
-        TransferId    uint32
+        TransferId    int32
         FileName      string
         FileRequested bool
 }
 
 func ParseNetFile(reader *bitreader.ReaderType) NetFile {
         return NetFile{
-                TransferId:    reader.TryReadInt32(),
+                TransferId:    int32(reader.TryReadBits(32)),
                 FileName:      reader.TryReadString(),
                 FileRequested: reader.TryReadBool(),
         }
diff --git a/pkg/messages/types/netNop.go b/pkg/messages/types/netNop.go
new file mode 100644
index 0000000..33f8e25
--- /dev/null
+++ b/pkg/messages/types/netNop.go
@@ -0,0 +1,9 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type NetNop struct{}
+
+func ParseNetNop(reader *bitreader.ReaderType) NetNop {
+        return NetNop{}
+}
diff --git a/packets/messages/types/NetSetConVar.go b/pkg/messages/types/netSetConVar.go
index eca05e0..08042ae 100644
--- a/packets/messages/types/NetSetConVar.go
+++ b/pkg/messages/types/netSetConVar.go
@@ -1,26 +1,29 @@
-package types
+package messages
 
 import "github.com/pektezol/bitreader"
 
 type NetSetConVar struct {
-        ConVars []ConVar
+        Length  int8
+        ConVars []conVar
 }
 
-type ConVar struct {
+type conVar struct {
         Name  string
         Value string
 }
 
 func ParseNetSetConVar(reader *bitreader.ReaderType) NetSetConVar {
-        length := reader.TryReadInt8()
-        convars := make([]ConVar, length)
-        for i := 0; i < int(length); i++ {
-                convars[i] = ConVar{
+        length := reader.TryReadBits(8)
+        convars := []conVar{}
+        for count := 0; count < int(length); count++ {
+                convar := conVar{
                         Name:  reader.TryReadString(),
                         Value: reader.TryReadString(),
                 }
+                convars = append(convars, convar)
         }
         return NetSetConVar{
+                Length:  int8(length),
                 ConVars: convars,
         }
 }
diff --git a/pkg/messages/types/netSignOnState.go b/pkg/messages/types/netSignOnState.go
new file mode 100644
index 0000000..4609ff2
--- /dev/null
+++ b/pkg/messages/types/netSignOnState.go
@@ -0,0 +1,26 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type NetSignOnState struct {
+        SignOnState        int8
+        SpawnCount         int32
+        NumServerPlayers   int32
+        IdsLength          int32
+        PlayersNetworksIds []byte
+        MapNameLength      int32
+        MapName            string
+}
+
+func ParseNetSignOnState(reader *bitreader.ReaderType) NetSignOnState {
+        netSignOnState := NetSignOnState{
+                SignOnState:      int8(reader.TryReadBits(8)),
+                SpawnCount:       int32(reader.TryReadBits(32)),
+                NumServerPlayers: int32(reader.TryReadBits(32)),
+                IdsLength:        int32(reader.TryReadBits(32)),
+        }
+        netSignOnState.PlayersNetworksIds = reader.TryReadBytesToSlice(int(netSignOnState.IdsLength))
+        netSignOnState.MapNameLength = int32(reader.TryReadBits(32))
+        netSignOnState.MapName = reader.TryReadStringLen(int(netSignOnState.MapNameLength))
+        return netSignOnState
+}
diff --git a/packets/messages/types/NetSplitScreenUser.go b/pkg/messages/types/netSplitScreenUser.go
index d4d04b5..65e85f3 100644
--- a/packets/messages/types/NetSplitScreenUser.go
+++ b/pkg/messages/types/netSplitScreenUser.go
@@ -1,13 +1,13 @@
-package types
+package messages
 
 import "github.com/pektezol/bitreader"
 
 type NetSplitScreenUser struct {
-        PlayerSlot bool
+        Unknown bool
 }
 
 func ParseNetSplitScreenUser(reader *bitreader.ReaderType) NetSplitScreenUser {
         return NetSplitScreenUser{
-                PlayerSlot: reader.TryReadBool(),
+                Unknown: reader.TryReadBool(),
         }
 }
diff --git a/packets/messages/types/NetStringCmd.go b/pkg/messages/types/netStringCmd.go
index 1ee9f67..158658e 100644
--- a/packets/messages/types/NetStringCmd.go
+++ b/pkg/messages/types/netStringCmd.go
@@ -1,4 +1,4 @@
-package types
+package messages
 
 import "github.com/pektezol/bitreader"
 
diff --git a/pkg/messages/types/netTick.go b/pkg/messages/types/netTick.go
new file mode 100644
index 0000000..e14f259
--- /dev/null
+++ b/pkg/messages/types/netTick.go
@@ -0,0 +1,17 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type NetTick struct {
+        Tick                      int32
+        HostFrameTime             int16
+        HostFrameTimeStdDeviation int16
+}
+
+func ParseNetTick(reader *bitreader.ReaderType) NetTick {
+        return NetTick{
+                Tick:                      int32(reader.TryReadBits(32)),
+                HostFrameTime:             int16(reader.TryReadBits(16) / 10e5),
+                HostFrameTimeStdDeviation: int16(reader.TryReadBits(16) / 10e5),
+        }
+}
diff --git a/pkg/messages/types/svcBspDecal.go b/pkg/messages/types/svcBspDecal.go
new file mode 100644
index 0000000..484497f
--- /dev/null
+++ b/pkg/messages/types/svcBspDecal.go
@@ -0,0 +1,61 @@
+package messages
+
+import (
+        "github.com/pektezol/bitreader"
+)
+
+type SvcBspDecal struct {
+        Pos               []vectorCoord
+        DecalTextureIndex int16
+        EntityIndex       int16
+        ModelIndex        int16
+        LowPriority       int8
+}
+
+type vectorCoord struct {
+        Value float32
+        Valid bool
+}
+
+func ParseSvcBspDecal(reader *bitreader.ReaderType) SvcBspDecal {
+        svcBspDecal := SvcBspDecal{
+                Pos:               readVectorCoords(reader),
+                DecalTextureIndex: int16(reader.TryReadBits(9)),
+        }
+        if reader.TryReadBool() {
+                svcBspDecal.EntityIndex = int16(reader.TryReadBits(11))
+                svcBspDecal.ModelIndex = int16(reader.TryReadBits(11))
+        }
+        svcBspDecal.LowPriority = int8(reader.TryReadBits(1))
+        return svcBspDecal
+}
+
+func readVectorCoords(reader *bitreader.ReaderType) []vectorCoord {
+        const COORD_INTEGER_BITS uint8 = 14
+        const COORD_FRACTIONAL_BITS uint8 = 5
+        const COORD_DENOMINATOR uint8 = 1 << COORD_FRACTIONAL_BITS
+        const COORD_RESOLUTION float32 = 1.0 / float32(COORD_DENOMINATOR)
+        readVectorCoord := func() float32 {
+                value := float32(0)
+                integer := reader.TryReadBits(1)
+                fraction := reader.TryReadBits(1)
+                if integer != 0 || fraction != 0 {
+                        sign := reader.TryReadBits(1)
+                        if integer != 0 {
+                                integer = reader.TryReadBits(int(COORD_INTEGER_BITS)) + 1
+                        }
+                        if fraction != 0 {
+                                fraction = reader.TryReadBits(int(COORD_FRACTIONAL_BITS))
+                        }
+                        value = float32(integer) + float32(fraction)*COORD_RESOLUTION
+                        if sign != 0 {
+                                value = -value
+                        }
+                }
+                return value
+        }
+        x := reader.TryReadBits(1)
+        y := reader.TryReadBits(1)
+        z := reader.TryReadBits(1)
+        return []vectorCoord{{Value: readVectorCoord(), Valid: x != 0}, {Value: readVectorCoord(), Valid: y != 0}, {Value: readVectorCoord(), Valid: z != 0}}
+}
diff --git a/pkg/messages/types/svcClassInfo.go b/pkg/messages/types/svcClassInfo.go
new file mode 100644
index 0000000..9f367d3
--- /dev/null
+++ b/pkg/messages/types/svcClassInfo.go
@@ -0,0 +1,40 @@
+package messages
+
+import (
+        "fmt"
+        "math"
+
+        "github.com/pektezol/bitreader"
+)
+
+type SvcClassInfo struct {
+        Length         int16
+        CreateOnClient bool
+        ServerClasses  []serverClass
+}
+
+type serverClass struct {
+        ClassId       int16
+        ClassName     string
+        DataTableName string
+}
+
+func ParseSvcClassInfo(reader *bitreader.ReaderType) SvcClassInfo {
+        svcClassInfo := SvcClassInfo{
+                Length:         int16(reader.TryReadBits(16)),
+                CreateOnClient: reader.TryReadBool(),
+        }
+        classes := []serverClass{}
+        if !svcClassInfo.CreateOnClient {
+                for count := 0; count < int(svcClassInfo.Length); count++ {
+                        fmt.Println(classes)
+                        classes = append(classes, serverClass{
+                                ClassId:       int16(reader.TryReadBits(int(math.Log2(float64(svcClassInfo.Length)) + 1))),
+                                ClassName:     reader.TryReadString(),
+                                DataTableName: reader.TryReadString(),
+                        })
+                }
+        }
+        svcClassInfo.ServerClasses = classes
+        return svcClassInfo
+}
diff --git a/pkg/messages/types/svcCmdKeyValues.go b/pkg/messages/types/svcCmdKeyValues.go
new file mode 100644
index 0000000..1c4d819
--- /dev/null
+++ b/pkg/messages/types/svcCmdKeyValues.go
@@ -0,0 +1,16 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcCmdKeyValues struct {
+        Length int32
+        Data   []byte
+}
+
+func ParseSvcCmdKeyValues(reader *bitreader.ReaderType) SvcCmdKeyValues {
+        svcCmdKeyValues := SvcCmdKeyValues{
+                Length: int32(reader.TryReadBits(32)),
+        }
+        svcCmdKeyValues.Data = reader.TryReadBytesToSlice(int(svcCmdKeyValues.Length))
+        return svcCmdKeyValues
+}
diff --git a/pkg/messages/types/svcCreateStringTable.go b/pkg/messages/types/svcCreateStringTable.go
new file mode 100644
index 0000000..ed9e477
--- /dev/null
+++ b/pkg/messages/types/svcCreateStringTable.go
@@ -0,0 +1,36 @@
+package messages
+
+import (
+        "math"
+
+        "github.com/pektezol/bitreader"
+)
+
+type SvcCreateStringTable struct {
+        Name              string
+        MaxEntries        int16
+        NumEntries        int8
+        Length            int32
+        UserDataFixedSize bool
+        UserDataSize      int16
+        UserDataSizeBits  int8
+        Flags             int8
+        StringData        int
+}
+
+func ParseSvcCreateStringTable(reader *bitreader.ReaderType) SvcCreateStringTable {
+        svcCreateStringTable := SvcCreateStringTable{
+                Name:       reader.TryReadString(),
+                MaxEntries: int16(reader.TryReadBits(16)),
+        }
+        svcCreateStringTable.NumEntries = int8(reader.TryReadBits(int(math.Log2(float64(svcCreateStringTable.MaxEntries))) + 1))
+        svcCreateStringTable.Length = int32(reader.TryReadBits(20))
+        svcCreateStringTable.UserDataFixedSize = reader.TryReadBool()
+        if svcCreateStringTable.UserDataFixedSize {
+                svcCreateStringTable.UserDataSize = int16(reader.TryReadBits(12))
+                svcCreateStringTable.UserDataSizeBits = int8(reader.TryReadBits(4))
+        }
+        svcCreateStringTable.Flags = int8(reader.TryReadBits(2))
+        reader.SkipBits(int(svcCreateStringTable.Length)) // TODO: StringTable parsing
+        return svcCreateStringTable
+}
diff --git a/packets/messages/types/SvcCrosshairAngle.go b/pkg/messages/types/svcCrosshairAngle.go
index 6584426..cf18212 100644
--- a/packets/messages/types/SvcCrosshairAngle.go
+++ b/pkg/messages/types/svcCrosshairAngle.go
@@ -1,4 +1,4 @@
-package types
+package messages
 
 import "github.com/pektezol/bitreader"
 
@@ -8,10 +8,6 @@ type SvcCrosshairAngle struct {
 
 func ParseSvcCrosshairAngle(reader *bitreader.ReaderType) SvcCrosshairAngle {
         return SvcCrosshairAngle{
-                Angle: []int16{
-                        int16(reader.TryReadInt16()),
-                        int16(reader.TryReadInt16()),
-                        int16(reader.TryReadInt16()),
-                },
+                Angle: []int16{int16(reader.TryReadBits(16)), int16(reader.TryReadBits(16)), int16(reader.TryReadBits(16))},
         }
 }
diff --git a/pkg/messages/types/svcEntityMessage.go b/pkg/messages/types/svcEntityMessage.go
new file mode 100644
index 0000000..9726ced
--- /dev/null
+++ b/pkg/messages/types/svcEntityMessage.go
@@ -0,0 +1,20 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcEntityMessage struct {
+        EntityIndex int16
+        ClassId     int16
+        Length      int16
+        Data        []byte
+}
+
+func ParseSvcEntityMessage(reader *bitreader.ReaderType) SvcEntityMessage {
+        svcEntityMessage := SvcEntityMessage{
+                EntityIndex: int16(reader.TryReadBits(11)),
+                ClassId:     int16(reader.TryReadBits(9)),
+                Length:      int16(reader.TryReadBits(11)),
+        }
+        svcEntityMessage.Data = reader.TryReadBitsToSlice(int(svcEntityMessage.Length))
+        return svcEntityMessage
+}
diff --git a/pkg/messages/types/svcFixAngle.go b/pkg/messages/types/svcFixAngle.go
new file mode 100644
index 0000000..56acf04
--- /dev/null
+++ b/pkg/messages/types/svcFixAngle.go
@@ -0,0 +1,15 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcFixAngle struct {
+        Relative bool
+        Angle    []int16
+}
+
+func ParseSvcFixAngle(reader *bitreader.ReaderType) SvcFixAngle {
+        return SvcFixAngle{
+                Relative: reader.TryReadBool(),
+                Angle:    []int16{int16(reader.TryReadBits(16)), int16(reader.TryReadBits(16)), int16(reader.TryReadBits(16))},
+        }
+}
diff --git a/pkg/messages/types/svcGameEvent.go b/pkg/messages/types/svcGameEvent.go
new file mode 100644
index 0000000..6ee4d01
--- /dev/null
+++ b/pkg/messages/types/svcGameEvent.go
@@ -0,0 +1,16 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcGameEvent struct {
+        Length int16
+        Data   []byte // TODO: GameEvent[]
+}
+
+func ParseSvcGameEvent(reader *bitreader.ReaderType) SvcGameEvent {
+        svcGameEvent := SvcGameEvent{
+                Length: int16(reader.TryReadBits(11)),
+        }
+        svcGameEvent.Data = reader.TryReadBitsToSlice(int(svcGameEvent.Length))
+        return svcGameEvent
+}
diff --git a/pkg/messages/types/svcGameEventList.go b/pkg/messages/types/svcGameEventList.go
new file mode 100644
index 0000000..b99ce28
--- /dev/null
+++ b/pkg/messages/types/svcGameEventList.go
@@ -0,0 +1,21 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcGameEventList struct {
+        Events              int16
+        Length              int32
+        GameEventDescriptor []gameEventDescriptor
+}
+
+type gameEventDescriptor struct {
+}
+
+func ParseSvcGameEventList(reader *bitreader.ReaderType) SvcGameEventList {
+        svcGameEventList := SvcGameEventList{
+                Events: int16(reader.TryReadBits(9)),
+                Length: int32(reader.TryReadBits(20)),
+        }
+        reader.TryReadBitsToSlice(int(svcGameEventList.Length))
+        return svcGameEventList
+}
diff --git a/packets/messages/types/SvcGetCvarValue.go b/pkg/messages/types/svcGetCvarValue.go
index 2925da5..aef5c8e 100644
--- a/packets/messages/types/SvcGetCvarValue.go
+++ b/pkg/messages/types/svcGetCvarValue.go
@@ -1,4 +1,4 @@
-package types
+package messages
 
 import "github.com/pektezol/bitreader"
 
@@ -8,8 +8,9 @@ type SvcGetCvarValue struct {
 }
 
 func ParseSvcGetCvarValue(reader *bitreader.ReaderType) SvcGetCvarValue {
-        return SvcGetCvarValue{
-                Cookie:   reader.TryReadStringLen(32),
+        svcGetCvarValue := SvcGetCvarValue{
+                Cookie:   reader.TryReadStringLen(4),
                 CvarName: reader.TryReadString(),
         }
+        return svcGetCvarValue
 }
diff --git a/pkg/messages/types/svcMenu.go b/pkg/messages/types/svcMenu.go
new file mode 100644
index 0000000..d89f52c
--- /dev/null
+++ b/pkg/messages/types/svcMenu.go
@@ -0,0 +1,18 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcMenu struct {
+        MenuType int16
+        Length   int32
+        Data     []byte
+}
+
+func ParseSvcMenu(reader *bitreader.ReaderType) SvcMenu {
+        svcMenu := SvcMenu{
+                MenuType: int16(reader.TryReadBits(16)),
+                Length:   int32(reader.TryReadBits(32)),
+        }
+        svcMenu.Data = reader.TryReadBitsToSlice(int(svcMenu.Length))
+        return svcMenu
+}
diff --git a/pkg/messages/types/svcPacketEntities.go b/pkg/messages/types/svcPacketEntities.go
new file mode 100644
index 0000000..b1c23e5
--- /dev/null
+++ b/pkg/messages/types/svcPacketEntities.go
@@ -0,0 +1,30 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcPacketEntities struct {
+        MaxEntries      int16
+        IsDelta         bool
+        DeltaFrom       int32
+        BaseLine        bool
+        UpdatedEntries  int16
+        Length          int32
+        UpdatedBaseline bool
+        Data            []byte
+}
+
+func ParseSvcPacketEntities(reader *bitreader.ReaderType) SvcPacketEntities {
+        svcPacketEntities := SvcPacketEntities{
+                MaxEntries: int16(reader.TryReadBits(11)),
+                IsDelta:    reader.TryReadBool(),
+        }
+        if svcPacketEntities.IsDelta {
+                svcPacketEntities.DeltaFrom = int32(reader.TryReadBits(32))
+        }
+        svcPacketEntities.BaseLine = reader.TryReadBool()
+        svcPacketEntities.UpdatedEntries = int16(reader.TryReadBits(11))
+        svcPacketEntities.Length = int32(reader.TryReadBits(20))
+        svcPacketEntities.UpdatedBaseline = reader.TryReadBool()
+        svcPacketEntities.Data = reader.TryReadBitsToSlice(int(svcPacketEntities.Length))
+        return svcPacketEntities
+}
diff --git a/pkg/messages/types/svcPaintmapData.go b/pkg/messages/types/svcPaintmapData.go
new file mode 100644
index 0000000..6b041da
--- /dev/null
+++ b/pkg/messages/types/svcPaintmapData.go
@@ -0,0 +1,16 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcPaintmapData struct {
+        Length int32
+        Data   []byte
+}
+
+func ParseSvcPaintmapData(reader *bitreader.ReaderType) SvcPaintmapData {
+        svcPaintmapData := SvcPaintmapData{
+                Length: int32(reader.TryReadBits(32)),
+        }
+        svcPaintmapData.Data = reader.TryReadBitsToSlice(int(svcPaintmapData.Length))
+        return svcPaintmapData
+}
diff --git a/packets/messages/types/SvcPrefetch.go b/pkg/messages/types/svcPrefetch.go
index b277252..549f926 100644
--- a/packets/messages/types/SvcPrefetch.go
+++ b/pkg/messages/types/svcPrefetch.go
@@ -1,4 +1,4 @@
-package types
+package messages
 
 import "github.com/pektezol/bitreader"
 
diff --git a/packets/messages/types/SvcPrint.go b/pkg/messages/types/svcPrint.go
index c6d91ac..8aff927 100644
--- a/packets/messages/types/SvcPrint.go
+++ b/pkg/messages/types/svcPrint.go
@@ -1,4 +1,4 @@
-package types
+package messages
 
 import "github.com/pektezol/bitreader"
 
diff --git a/pkg/messages/types/svcSendTable.go b/pkg/messages/types/svcSendTable.go
new file mode 100644
index 0000000..ae8960b
--- /dev/null
+++ b/pkg/messages/types/svcSendTable.go
@@ -0,0 +1,17 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcSendTable struct {
+        NeedsDecoder int8
+        Length       int8
+        Props        int32
+}
+
+func ParseSvcSendTable(reader *bitreader.ReaderType) SvcSendTable {
+        return SvcSendTable{
+                NeedsDecoder: int8(reader.TryReadBits(8)),
+                Length:       int8(reader.TryReadBits(8)),
+                Props:        int32(reader.TryReadBits(32)),
+        }
+}
diff --git a/pkg/messages/types/svcServerInfo.go b/pkg/messages/types/svcServerInfo.go
new file mode 100644
index 0000000..b8bb308
--- /dev/null
+++ b/pkg/messages/types/svcServerInfo.go
@@ -0,0 +1,43 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcServerInfo struct {
+        Protocol     int16
+        ServerCount  int32
+        IsHltv       bool
+        IsDedicated  bool
+        ClientCrc    int32
+        MaxClasses   int16
+        MapCrc       int32
+        PlayerSlot   int8
+        MaxClients   int8
+        Unk          int32
+        TickInterval int32
+        COs          int8
+        GameDir      string
+        MapName      string
+        SkyName      string
+        HostName     string
+}
+
+func ParseSvcServerInfo(reader *bitreader.ReaderType) SvcServerInfo {
+        return SvcServerInfo{
+                Protocol:     int16(reader.TryReadBits(16)),
+                ServerCount:  int32(reader.TryReadBits(32)),
+                IsHltv:       reader.TryReadBool(),
+                IsDedicated:  reader.TryReadBool(),
+                ClientCrc:    int32(reader.TryReadBits(32)),
+                MaxClasses:   int16(reader.TryReadBits(16)),
+                MapCrc:       int32(reader.TryReadBits(32)),
+                PlayerSlot:   int8(reader.TryReadBits(8)),
+                MaxClients:   int8(reader.TryReadBits(8)),
+                Unk:          int32(reader.TryReadBits(32)),
+                TickInterval: int32(reader.TryReadBits(32)),
+                COs:          int8(reader.TryReadBits(8)),
+                GameDir:      reader.TryReadString(),
+                MapName:      reader.TryReadString(),
+                SkyName:      reader.TryReadString(),
+                HostName:     reader.TryReadString(),
+        }
+}
diff --git a/packets/messages/types/SvcSetPause.go b/pkg/messages/types/svcSetPause.go
index c71485c..94303b7 100644
--- a/packets/messages/types/SvcSetPause.go
+++ b/pkg/messages/types/svcSetPause.go
@@ -1,13 +1,13 @@
-package types
+package messages
 
-import (
-        "github.com/pektezol/bitreader"
-)
+import "github.com/pektezol/bitreader"
 
 type SvcSetPause struct {
         Paused bool
 }
 
 func ParseSvcSetPause(reader *bitreader.ReaderType) SvcSetPause {
-        return SvcSetPause{Paused: reader.TryReadBool()}
+        return SvcSetPause{
+                Paused: reader.TryReadBool(),
+        }
 }
diff --git a/packets/messages/types/SvcSetView.go b/pkg/messages/types/svcSetView.go
index 5507eae..70d1e2b 100644
--- a/packets/messages/types/SvcSetView.go
+++ b/pkg/messages/types/svcSetView.go
@@ -1,4 +1,4 @@
-package types
+package messages
 
 import "github.com/pektezol/bitreader"
 
diff --git a/pkg/messages/types/svcSounds.go b/pkg/messages/types/svcSounds.go
new file mode 100644
index 0000000..e87d584
--- /dev/null
+++ b/pkg/messages/types/svcSounds.go
@@ -0,0 +1,25 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcSounds struct {
+        ReliableSound bool
+        Size          int8
+        Length        int16
+        Data          []byte
+}
+
+func ParseSvcSounds(reader *bitreader.ReaderType) SvcSounds {
+        svcSounds := SvcSounds{
+                ReliableSound: reader.TryReadBool(),
+        }
+        if svcSounds.ReliableSound {
+                svcSounds.Size = 1
+                svcSounds.Length = int16(reader.TryReadBits(8))
+        } else {
+                svcSounds.Size = int8(reader.TryReadBits(8))
+                svcSounds.Length = int16(reader.TryReadBits(16))
+        }
+        svcSounds.Data = reader.TryReadBitsToSlice(int(svcSounds.Length))
+        return svcSounds
+}
diff --git a/pkg/messages/types/svcSplitScreen.go b/pkg/messages/types/svcSplitScreen.go
new file mode 100644
index 0000000..9c808bc
--- /dev/null
+++ b/pkg/messages/types/svcSplitScreen.go
@@ -0,0 +1,18 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcSplitScreen struct {
+        Unk    bool
+        Length int16
+        Data   []byte
+}
+
+func ParseSvcSplitScreen(reader *bitreader.ReaderType) SvcSplitScreen {
+        svcSplitScreen := SvcSplitScreen{
+                Unk:    reader.TryReadBool(),
+                Length: int16(reader.TryReadBits(11)),
+        }
+        svcSplitScreen.Data = reader.TryReadBitsToSlice(int(svcSplitScreen.Length))
+        return svcSplitScreen
+}
diff --git a/pkg/messages/types/svcTempEntities.go b/pkg/messages/types/svcTempEntities.go
new file mode 100644
index 0000000..d22423d
--- /dev/null
+++ b/pkg/messages/types/svcTempEntities.go
@@ -0,0 +1,18 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcTempEntities struct {
+        NumEntries int8
+        Length     int32
+        Data       []byte
+}
+
+func ParseSvcTempEntities(reader *bitreader.ReaderType) SvcTempEntities {
+        svcTempEntities := SvcTempEntities{
+                NumEntries: int8(reader.TryReadBits(8)),
+                Length:     int32(reader.TryReadBits(17)),
+        }
+        svcTempEntities.Data = reader.TryReadBitsToSlice(int(svcTempEntities.Length))
+        return svcTempEntities
+}
diff --git a/pkg/messages/types/svcUpdateStringTable.go b/pkg/messages/types/svcUpdateStringTable.go
new file mode 100644
index 0000000..2840482
--- /dev/null
+++ b/pkg/messages/types/svcUpdateStringTable.go
@@ -0,0 +1,22 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcUpdateStringTable struct {
+        TableId           int8
+        NumChangedEntries int16
+        Length            int32
+        Data              []byte
+}
+
+func ParseSvcUpdateStringTable(reader *bitreader.ReaderType) SvcUpdateStringTable {
+        svcUpdateStringTable := SvcUpdateStringTable{
+                TableId: int8(reader.TryReadBits(5)),
+        }
+        if reader.TryReadBool() {
+                svcUpdateStringTable.NumChangedEntries = int16(reader.TryReadBits(16))
+        }
+        svcUpdateStringTable.Length = int32(reader.TryReadBits(20))
+        svcUpdateStringTable.Data = reader.TryReadBitsToSlice(int(svcUpdateStringTable.Length))
+        return svcUpdateStringTable
+}
diff --git a/pkg/messages/types/svcUserMessage.go b/pkg/messages/types/svcUserMessage.go
new file mode 100644
index 0000000..b53c7c0
--- /dev/null
+++ b/pkg/messages/types/svcUserMessage.go
@@ -0,0 +1,18 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcUserMessage struct {
+        MsgType int8
+        Length  int16
+        Data    []byte
+}
+
+func ParseSvcUserMessage(reader *bitreader.ReaderType) SvcUserMessage {
+        svcUserMessage := SvcUserMessage{
+                MsgType: int8(reader.TryReadBits(8)),
+                Length:  int16(reader.TryReadBits(12)),
+        }
+        svcUserMessage.Data = reader.TryReadBitsToSlice(int(svcUserMessage.Length))
+        return svcUserMessage
+}
diff --git a/pkg/messages/types/svcVoiceData.go b/pkg/messages/types/svcVoiceData.go
new file mode 100644
index 0000000..b6c81d4
--- /dev/null
+++ b/pkg/messages/types/svcVoiceData.go
@@ -0,0 +1,20 @@
+package messages
+
+import "github.com/pektezol/bitreader"
+
+type SvcVoiceData struct {
+        Client    int8
+        Proximity int8
+        Length    int16
+        Data      []byte
+}
+
+func ParseSvcVoiceData(reader *bitreader.ReaderType) SvcVoiceData {
+        svcVoiceData := SvcVoiceData{
+                Client:    int8(reader.TryReadBits(8)),
+                Proximity: int8(reader.TryReadBits(8)),
+                Length:    int16(reader.TryReadBits(16)),
+        }
+        svcVoiceData.Data = reader.TryReadBitsToSlice(int(svcVoiceData.Length))
+        return svcVoiceData
+}
diff --git a/packets/messages/types/SvcVoiceInit.go b/pkg/messages/types/svcVoiceInit.go
index 3e18a7b..4c95aab 100644
--- a/packets/messages/types/SvcVoiceInit.go
+++ b/pkg/messages/types/svcVoiceInit.go
@@ -1,4 +1,4 @@
-package types
+package messages
 
 import "github.com/pektezol/bitreader"
 
@@ -9,12 +9,12 @@ type SvcVoiceInit struct {
 }
 
 func ParseSvcVoiceInit(reader *bitreader.ReaderType) SvcVoiceInit {
-        svcvoiceinit := SvcVoiceInit{
+        svcVoiceInit := SvcVoiceInit{
                 Codec:   reader.TryReadString(),
-                Quality: reader.TryReadInt8(),
+                Quality: uint8(reader.TryReadBits(8)),
         }
-        if svcvoiceinit.Quality == 255 {
-                svcvoiceinit.Unk = reader.TryReadFloat32()
+        if svcVoiceInit.Quality == 0b11111111 {
+                svcVoiceInit.Unk = reader.TryReadFloat32()
         }
-        return svcvoiceinit
+        return svcVoiceInit
 }
diff --git a/pkg/packets/headers.go b/pkg/packets/headers.go
new file mode 100644
index 0000000..543476b
--- /dev/null
+++ b/pkg/packets/headers.go
@@ -0,0 +1,48 @@
+package packets
+
+import (
+        "fmt"
+
+        "github.com/pektezol/bitreader"
+)
+
+type Headers struct {
+        DemoFileStamp   string
+        DemoProtocol    int32
+        NetworkProtocol int32
+        ServerName      string
+        ClientName      string
+        MapName         string
+        GameDirectory   string
+        PlaybackTime    float32
+        PlaybackTicks   int32
+        PlaybackFrames  int32
+        SignOnLength    int32
+}
+
+func ParseHeaders(reader *bitreader.ReaderType) Headers {
+        headers := Headers{
+                DemoFileStamp:   reader.TryReadString(),
+                DemoProtocol:    int32(reader.TryReadInt32()),
+                NetworkProtocol: int32(reader.TryReadInt32()),
+                ServerName:      reader.TryReadStringLen(260),
+                ClientName:      reader.TryReadStringLen(260),
+                MapName:         reader.TryReadStringLen(260),
+                GameDirectory:   reader.TryReadStringLen(260),
+                PlaybackTime:    reader.TryReadFloat32(),
+                PlaybackTicks:   int32(reader.TryReadInt32()),
+                PlaybackFrames:  int32(reader.TryReadInt32()),
+                SignOnLength:    int32(reader.TryReadInt32()),
+        }
+        if headers.DemoFileStamp != "HL2DEMO" {
+                panic("invalid demo file stamp")
+        }
+        if headers.DemoProtocol != 4 {
+                panic("this parser only supports demos from new engine")
+        }
+        if headers.NetworkProtocol != 2001 {
+                panic("this parser only supports demos from portal 2")
+        }
+        fmt.Printf("Headers: %+v\n", headers)
+        return headers
+}
diff --git a/pkg/packets/packets.go b/pkg/packets/packets.go
new file mode 100644
index 0000000..a84da21
--- /dev/null
+++ b/pkg/packets/packets.go
@@ -0,0 +1,125 @@
+package packets
+
+import (
+        "bytes"
+
+        "github.com/pektezol/bitreader"
+        "github.com/pektezol/demoparser/pkg/classes"
+        "github.com/pektezol/demoparser/pkg/messages"
+)
+
+type PacketMessageInfo struct {
+        PacketType int8
+        TickNumber int32
+        SlotNumber int8
+        Data       any
+}
+
+const MSSC = 2
+
+func ParsePackets(reader *bitreader.ReaderType) PacketMessageInfo {
+        packetType := reader.TryReadBits(8)
+        tickNumber := reader.TryReadBits(32)
+        slotNumber := reader.TryReadBits(8)
+        var packetData any
+        switch packetType {
+        case 1: // SignOn
+                signOn := SignOn{}
+                for count := 0; count < MSSC; count++ {
+                        signOn.PacketInfo = append(signOn.PacketInfo, classes.ParseCmdInfo(reader))
+                }
+                signOn.InSequence = int32(reader.TryReadBits(32))
+                signOn.OutSequence = int32(reader.TryReadBits(32))
+                signOn.Size = int32(reader.TryReadInt32())
+                data := reader.TryReadBytesToSlice(int(signOn.Size))
+                packetReader := bitreader.Reader(bytes.NewReader(data), true)
+                for {
+                        messageType, err := packetReader.ReadBits(6)
+                        if err != nil {
+                                break
+                        }
+                        signOn.Data = append(signOn.Data, messages.ParseMessages(int(messageType), packetReader))
+                }
+                packetData = signOn
+        case 2: // Packet
+                packet := Packet{}
+                for count := 0; count < MSSC; count++ {
+                        packet.PacketInfo = append(packet.PacketInfo, classes.ParseCmdInfo(reader))
+                }
+                packet.InSequence = int32(reader.TryReadBits(32))
+                packet.OutSequence = int32(reader.TryReadBits(32))
+                packet.Size = int32(reader.TryReadInt32())
+                data := reader.TryReadBytesToSlice(int(packet.Size))
+                packetReader := bitreader.Reader(bytes.NewReader(data), true)
+                for {
+                        messageType, err := packetReader.ReadBits(6)
+                        if err != nil {
+                                break
+                        }
+                        packet.Data = append(packet.Data, messages.ParseMessages(int(messageType), packetReader))
+                }
+                packetData = packet
+        case 3: // SyncTick
+                syncTick := SyncTick{}
+                packetData = syncTick
+        case 4: // ConsoleCmd
+                size := reader.TryReadInt32()
+                consoleCmd := ConsoleCmd{
+                        Size: int32(size),
+                        Data: reader.TryReadStringLen(int(size)),
+                }
+                packetData = consoleCmd
+        case 5: // UserCmd
+                userCmd := UserCmd{}
+                userCmd.Cmd = int32(reader.TryReadInt32())
+                userCmd.Size = int32(reader.TryReadInt32())
+                data := reader.TryReadBytesToSlice(int(userCmd.Size))
+                userCmd.Data = classes.ParseUserCmdInfo(data)
+                packetData = userCmd
+        case 6: // DataTables
+                dataTables := DataTables{}
+                dataTables.Size = int32(reader.TryReadInt32())
+                data := reader.TryReadBytesToSlice(int(dataTables.Size))
+                dataTableReader := bitreader.Reader(bytes.NewReader(data), true)
+                count := 0
+                for dataTableReader.TryReadBool() {
+                        count++
+                        dataTables.SendTable = append(dataTables.SendTable, classes.ParseSendTable(dataTableReader))
+                }
+                numOfClasses := dataTableReader.TryReadBits(16)
+                for count = 0; count < int(numOfClasses); count++ {
+                        dataTables.ServerClassInfo = append(dataTables.ServerClassInfo, classes.ParseServerClassInfo(dataTableReader, count, int(numOfClasses)))
+                }
+                packetData = dataTables
+        case 7: // Stop
+                stop := Stop{}
+                if reader.TryReadBool() {
+                        // read remaining data
+                        stop.RemainingData = []byte{}
+                }
+                packetData = stop
+        case 8: // CustomData
+                customData := CustomData{
+                        Unknown: int32(reader.TryReadBits(32)),
+                        Size:    int32(reader.TryReadBits(32)),
+                }
+                customData.Data = string(reader.TryReadBytesToSlice(int(customData.Size)))
+                packetData = customData
+        case 9: // StringTables
+                stringTables := StringTables{
+                        Size: int32(reader.TryReadInt32()),
+                }
+                data := reader.TryReadBytesToSlice(int(stringTables.Size))
+                stringTableReader := bitreader.Reader(bytes.NewReader(data), true)
+                stringTables.Data = classes.ParseStringTables(stringTableReader)
+                packetData = stringTables
+        default: // invalid
+                panic("invalid packet type")
+        }
+        return PacketMessageInfo{
+                PacketType: int8(packetType),
+                TickNumber: int32(tickNumber),
+                SlotNumber: int8(slotNumber),
+                Data:       packetData,
+        }
+}
diff --git a/packets/types.go b/pkg/packets/types.go
index 41d633a..6297b01 100644
--- a/packets/types.go
+++ b/pkg/packets/types.go
@@ -1,51 +1,40 @@
 package packets
 
-import (
-        "github.com/pektezol/demoparser/packets/classes"
-        "github.com/pektezol/demoparser/packets/messages"
-)
-
-type Header struct {
-        DemoFileStamp   string
-        DemoProtocol    uint32
-        NetworkProtocol uint32
-        ServerName      string
-        ClientName      string
-        MapName         string
-        GameDirectory   string
-        PlaybackTime    float32
-        PlaybackTicks   int32
-        PlaybackFrames  int32
-        SignOnLength    uint32
-}
+import "github.com/pektezol/demoparser/pkg/classes"
 
 type SignOn struct {
         PacketInfo  []classes.CmdInfo
         InSequence  int32
         OutSequence int32
-        Data        []messages.Message
+        Size        int32
+        Data        []any
 }
 
 type Packet struct {
         PacketInfo  []classes.CmdInfo
         InSequence  int32
         OutSequence int32
-        Data        []messages.Message
+        Size        int32
+        Data        []any
 }
 
 type SyncTick struct{}
 
 type ConsoleCmd struct {
+        Size int32
         Data string
 }
 
 type UserCmd struct {
         Cmd  int32
+        Size int32
         Data classes.UserCmdInfo
 }
 
 type DataTables struct {
-        Data classes.DataTable
+        Size            int32
+        SendTable       []classes.SendTable
+        ServerClassInfo []classes.ServerClassInfo
 }
 
 type Stop struct {
@@ -54,9 +43,11 @@ type Stop struct {
 
 type CustomData struct {
         Unknown int32
-        Data    []byte
+        Size    int32
+        Data    string
 }
 
 type StringTables struct {
+        Size int32
         Data []classes.StringTable
 }