Class reorganization, do not restore to this commit