Renamed some folders in preparation for work on the header