Mospace configuration refactor 2

fixes #1033, #1149, #1135