merging header/includes and fixing page structures accordingly