headers dir minimal restructure