#4137 Cleaned up namepsaces/folders in Metamodel
#4137 Further namespace clean-up