Fixing missing files after renaming some classes