Tidy up file structure