Reworking package structure, fields, etc.