update main file with new class structure