Header rearrangement
Delete handlers in main
Import header
Merge