[master] WIP: header orgnisation