restructured headers / sources