a bit more cleanup
file renaming