PIM-1584 Moving Category namespace