Configuration namespace and option reorganization