Tweak source configuration
Restructure headers