Cleaning up more of the file structure