Move MW specific classes into MW NS