Repackage a bunch of stuff.  Rework the GuiModule so it stands alone.