Move class name changes to correct directory