First commit of new class structure