class stuff and file renaming