progress in headers refactoring