clean up file structure