Category classesrestructured