Broke single constant class into a new class in each ns