more file renaming and subtle organization