More changes to the headers for new directory structure