Added namespace scope.
Arrays can be added even more.
New munging for module ids, adding subfolder names where required.