Add: Better structure for creating and packaging packets