Add canonical class structure to Project