clean up some extra files and rename