tidy up file structure