Architecture improvements

[mattpilott]

The existing architecture needs a rethink as the vanilla namespace is much heavier than the others, perhaps we could remove the namespace layer and have all the modules together, or alternatively create better namespaces