Created new class structure