Move system base config into system namespace