Class restructed.