General file structure tidy up