Finalized new class structure changes.