file renaming, moving; adds classes folder (again)