Re-namespacing all internal modules to be be consistent, and adding to other-modules cabal field