Continued laying out the new class structure