Revised folder structure for headers