Increased header size
Moved parser into its own package