Yet another restructuring of the classes... when will it end??