Delete duplicate class exception and reorganized imports