Correcting class structure to compliance with new class diagram