rearange header strcture
Merge pull request #16 from DaliaResearch/bootstrap_header_cleanup

rearange header strcture