clean up and rename some files