Timebox's organization of classes redesigned.