Mospace configuration refactor 2

merging in proposed changes to complete the milestone mospace-configuration-refactor-2