fixes to file structure