More organization of the gem