Reorganization, with a class again.