34 files changed, 41 insertions, 604 deletions

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/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/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/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/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/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/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/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/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
 }