70 files changed, 110 insertions, 110 deletions

diff --git a/Com/Simatime/Core.scm b/Alpha/Core.scm
index 83ded5d..3a5ac6e 100644
--- a/Com/Simatime/Core.scm
+++ b/Alpha/Core.scm
@@ -1,4 +1,4 @@
-(define-module (Com Simatime Core)
+(define-module (Alpha Core)
   #:use-module ((ice-9 format))
   #:export (
             ;; simple printing
diff --git a/Com/Simatime/Logic.scm b/Alpha/Logic.scm
index b693e9d..e438a03 100644
--- a/Com/Simatime/Logic.scm
+++ b/Alpha/Logic.scm
@@ -1,6 +1,6 @@
 ;; my mini kanren impl - basically untested so far
 
-(define-module (Com Simatime Logic))
+(define-module (Alpha Logic))
 
 (define-syntax λg
   (syntax-rules ()
diff --git a/Com/Simatime/Repl.scm b/Alpha/Repl.scm
index af9a494..f2d9160 100644
--- a/Com/Simatime/Repl.scm
+++ b/Alpha/Repl.scm
@@ -1,4 +1,4 @@
-(define-module (Com Simatime Repl)
+(define-module (Alpha Repl)
   #:export ())
 
 
diff --git a/Com/Simatime/Shell.scm b/Alpha/Shell.scm
index b99e5cd..3f52fd2 100644
--- a/Com/Simatime/Shell.scm
+++ b/Alpha/Shell.scm
@@ -1,4 +1,4 @@
-(define-module (Com Simatime Shell)
+(define-module (Alpha Shell)
   #:use-module ((ice-9 popen) #:prefix popen/)
   #:use-module ((ice-9 rdelim) #:prefix rdelim/)
   #:use-module ((ice-9 ftw) #:prefix ftw/)
diff --git a/Com/Simatime/String.scm b/Alpha/String.scm
index 770b04b..779c2fb 100644
--- a/Com/Simatime/String.scm
+++ b/Alpha/String.scm
@@ -1,4 +1,4 @@
-(define-module (Com Simatime String)
+(define-module (Alpha String)
   #:export (replace to-string str capitalize))
 
 (define (replace s match repl)
diff --git a/Com/Simatime/Test.scm b/Alpha/Test.scm
index 638940f..8c0916d 100644
--- a/Com/Simatime/Test.scm
+++ b/Alpha/Test.scm
@@ -1,8 +1,8 @@
 ;; a testing framework for scheme
 ;; inspired by clojure.test and srfi-64
 
-(define-module (Com Simatime Test)
-  #:use-module ((Com Simatime core)
+(define-module (Alpha Test)
+  #:use-module ((Alpha Core)
                 #:select (prn))
   #:export (testing))
 
diff --git a/Com/Simatime/Bild.scm b/Biz/Bild.scm
index 6b8c2ea..4e1d490 100755
--- a/Com/Simatime/Bild.scm
+++ b/Biz/Bild.scm
@@ -70,7 +70,7 @@
 ;; 'com.simatime.lib':
 ;;
 ;;     ghc com/simatime/bild.hs -i com/simatime/lib.hs -o _bild/bild -v \
-;;         -main-is Com.Simatime.Bild.main
+;;         -main-is Biz.Bild.main
 ;;
 ;; The general template of which is:
 ;;
@@ -120,13 +120,13 @@
 ;;
 ;;; Code:
 
-(define-module (Com Simatime Bild)
+(define-module (Biz Bild)
   #:use-module ((ice-9 popen) #:prefix popen/)
   #:use-module ((ice-9 format) #:select (format))
   #:use-module ((ice-9 rdelim) #:prefix rdelim/)
-  #:use-module ((Com Simatime Core) #:select (fmt))
-  #:use-module ((Com Simatime Shell) #:prefix sh/)
-  #:use-module ((Com Simatime String) #:prefix string/)
+  #:use-module ((Alpha Core) #:select (fmt))
+  #:use-module ((Alpha Shell) #:prefix sh/)
+  #:use-module ((Alpha String) #:prefix string/)
   #:export (ns?
             ns->path
             path->ns
diff --git a/Com/Simatime/Cloud/chat.nix b/Biz/Cloud/chat.nix
index e23b73e..e23b73e 100644
--- a/Com/Simatime/Cloud/chat.nix
+++ b/Biz/Cloud/chat.nix
diff --git a/Com/Simatime/Cloud/git.nix b/Biz/Cloud/git.nix
index 370f52a..370f52a 100644
--- a/Com/Simatime/Cloud/git.nix
+++ b/Biz/Cloud/git.nix
diff --git a/Com/Simatime/Cloud/hardware.nix b/Biz/Cloud/hardware.nix
index 8c88cb7..8c88cb7 100644
--- a/Com/Simatime/Cloud/hardware.nix
+++ b/Biz/Cloud/hardware.nix
diff --git a/Com/Simatime/Cloud/mail.nix b/Biz/Cloud/mail.nix
index 81bddc2..81bddc2 100644
--- a/Com/Simatime/Cloud/mail.nix
+++ b/Biz/Cloud/mail.nix
diff --git a/Com/Simatime/Cloud/networking.nix b/Biz/Cloud/networking.nix
index d943c13..d943c13 100644
--- a/Com/Simatime/Cloud/networking.nix
+++ b/Biz/Cloud/networking.nix
diff --git a/Com/Simatime/Cloud/web.nix b/Biz/Cloud/web.nix
index 22d7199..22d7199 100644
--- a/Com/Simatime/Cloud/web.nix
+++ b/Biz/Cloud/web.nix
diff --git a/Com/Simatime/Cloud/znc.nix b/Biz/Cloud/znc.nix
index 9b1a28d..9b1a28d 100644
--- a/Com/Simatime/Cloud/znc.nix
+++ b/Biz/Cloud/znc.nix
diff --git a/Com/Simatime/Dev/configuration.nix b/Biz/Dev/configuration.nix
index 4a8839e..4a8839e 100644
--- a/Com/Simatime/Dev/configuration.nix
+++ b/Biz/Dev/configuration.nix
diff --git a/Com/Simatime/Dev/hardware.nix b/Biz/Dev/hardware.nix
index fc0e7a0..fc0e7a0 100644
--- a/Com/Simatime/Dev/hardware.nix
+++ b/Biz/Dev/hardware.nix
diff --git a/Com/InfluencedByBooks/Client.hs b/Biz/Ibb/Client.hs
index 8c70a04..e40ff36 100644
--- a/Com/InfluencedByBooks/Client.hs
+++ b/Biz/Ibb/Client.hs
@@ -14,14 +14,14 @@
 -- : dep aeson
 -- : dep containers
 -- : dep ghcjs-base
-module Com.InfluencedByBooks.Client where
+module Biz.Ibb.Client where
 
 import           Alpha
-import           Com.InfluencedByBooks.Core     ( Action(..)
+import           Biz.Ibb.Core     ( Action(..)
                                                 , see
                                                 , init
                                                 )
-import           Com.InfluencedByBooks.Move     ( move )
+import           Biz.Ibb.Move     ( move )
 import           Miso                           ( App(..)
                                                 , defaultEvents
                                                 , miso
diff --git a/Com/InfluencedByBooks/Core.hs b/Biz/Ibb/Core.hs
index 2b98914..fb82ff0 100644
--- a/Com/InfluencedByBooks/Core.hs
+++ b/Biz/Ibb/Core.hs
@@ -5,10 +5,10 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 -- | Main app logic
-module Com.InfluencedByBooks.Core where
+module Biz.Ibb.Core where
 
 import           Alpha
-import           Com.Simatime.Network
+import           Network.RemoteData
 import           Data.Aeson              hiding ( Success )
 import           Data.Data                      ( Data
                                                 , Typeable
diff --git a/Com/InfluencedByBooks/Influencers.hs b/Biz/Ibb/Influencers.hs
index 2583770..c31e962 100644
--- a/Com/InfluencedByBooks/Influencers.hs
+++ b/Biz/Ibb/Influencers.hs
@@ -2,9 +2,9 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 
-module Com.InfluencedByBooks.Influencers where
+module Biz.Ibb.Influencers where
 
-import Com.InfluencedByBooks.Core
+import Biz.Ibb.Core
 
 allPeople :: [Person]
 allPeople =
diff --git a/Com/InfluencedByBooks/Keep.hs b/Biz/Ibb/Keep.hs
index b84d4d8..ad6dc5c 100644
--- a/Com/InfluencedByBooks/Keep.hs
+++ b/Biz/Ibb/Keep.hs
@@ -10,10 +10,10 @@
 -- `Biz.Keep`. I could wrap all the safecopy stuff in my own template haskell
 -- like `$(keep ''MyType)`.
 --
-module Com.InfluencedByBooks.Keep where
+module Biz.Ibb.Keep where
 
-import           Com.InfluencedByBooks.Core (Person(..), Book(..))
-import qualified Com.InfluencedByBooks.Influencers as Influencers
+import           Biz.Ibb.Core (Person(..), Book(..))
+import qualified Biz.Ibb.Influencers as Influencers
 import           Control.Monad.Reader (ask)
 import           Control.Monad.State (get, put)
 import           Data.Acid (Update, makeAcidic)
diff --git a/Com/InfluencedByBooks/Look.hs b/Biz/Ibb/Look.hs
index d904d3a..5f7ca6b 100644
--- a/Com/InfluencedByBooks/Look.hs
+++ b/Biz/Ibb/Look.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
 -- | The look and feel of Ibb
-module Com.InfluencedByBooks.Look where
+module Biz.Ibb.Look where
 
 import           Alpha                   hiding ( Selector )
 import           Clay
diff --git a/Com/InfluencedByBooks/Move.hs b/Biz/Ibb/Move.hs
index 5d6f0c4..1e635ac 100644
--- a/Com/InfluencedByBooks/Move.hs
+++ b/Biz/Ibb/Move.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 -- | App update logic
-module Com.InfluencedByBooks.Move
+module Biz.Ibb.Move
   ( move
   -- * Server interactions
   , fetchPeople
@@ -10,8 +10,8 @@ module Com.InfluencedByBooks.Move
 where
 
 import           Alpha
-import           Com.InfluencedByBooks.Core    as Core
-import           Com.Simatime.Network
+import           Biz.Ibb.Core    as Core
+import           Network.RemoteData
 import           Data.Aeson
 import           JavaScript.Web.XMLHttpRequest  ( Request(..)
                                                 , Method(GET)
diff --git a/Com/InfluencedByBooks/Server.hs b/Biz/Ibb/Server.hs
index 244a7ca..9f1ac5f 100644
--- a/Com/InfluencedByBooks/Server.hs
+++ b/Biz/Ibb/Server.hs
@@ -25,14 +25,14 @@
 -- : dep scotty
 -- : dep servant-server
 -- : dep text
-module Com.InfluencedByBooks.Server where
+module Biz.Ibb.Server where
 
 import           Alpha
 import qualified Clay
-import           Com.InfluencedByBooks.Core
-import qualified Com.InfluencedByBooks.Keep    as Keep
-import qualified Com.InfluencedByBooks.Look    as Look
-import           Com.Simatime.Network
+import           Biz.Ibb.Core
+import qualified Biz.Ibb.Keep    as Keep
+import qualified Biz.Ibb.Look    as Look
+import           Network.RemoteData
 import           Data.Acid                      ( AcidState )
 import qualified Data.Acid.Abstract            as Acid
 import           Data.Maybe                     ( fromMaybe )
diff --git a/Com/InfluencedByBooks/service.nix b/Biz/Ibb/service.nix
index f9d0f36..f9d0f36 100644
--- a/Com/InfluencedByBooks/service.nix
+++ b/Biz/Ibb/service.nix
diff --git a/Com/Simatime/Language/Bs.hs b/Biz/Language/Bs.hs
index a810706..a810706 100644
--- a/Com/Simatime/Language/Bs.hs
+++ b/Biz/Language/Bs.hs
diff --git a/Com/Simatime/Language/Bs/Cli.hs b/Biz/Language/Bs/Cli.hs
index 4c48c86..4c48c86 100644
--- a/Com/Simatime/Language/Bs/Cli.hs
+++ b/Biz/Language/Bs/Cli.hs
diff --git a/Com/Simatime/Language/Bs/Eval.hs b/Biz/Language/Bs/Eval.hs
index 290170b..290170b 100644
--- a/Com/Simatime/Language/Bs/Eval.hs
+++ b/Biz/Language/Bs/Eval.hs
diff --git a/Com/Simatime/Language/Bs/Expr.hs b/Biz/Language/Bs/Expr.hs
index a39c7b6..a39c7b6 100644
--- a/Com/Simatime/Language/Bs/Expr.hs
+++ b/Biz/Language/Bs/Expr.hs
diff --git a/Com/Simatime/Language/Bs/Parser.hs b/Biz/Language/Bs/Parser.hs
index 3044a60..3044a60 100644
--- a/Com/Simatime/Language/Bs/Parser.hs
+++ b/Biz/Language/Bs/Parser.hs
diff --git a/Com/Simatime/Language/Bs/Primitives.hs b/Biz/Language/Bs/Primitives.hs
index c074c59..c074c59 100644
--- a/Com/Simatime/Language/Bs/Primitives.hs
+++ b/Biz/Language/Bs/Primitives.hs
diff --git a/Com/Simatime/Language/Bs/Repl.hs b/Biz/Language/Bs/Repl.hs
index 64ffaa2..64ffaa2 100644
--- a/Com/Simatime/Language/Bs/Repl.hs
+++ b/Biz/Language/Bs/Repl.hs
diff --git a/Com/Simatime/Language/Bs/Test.hs b/Biz/Language/Bs/Test.hs
index 4a40036..4a40036 100644
--- a/Com/Simatime/Language/Bs/Test.hs
+++ b/Biz/Language/Bs/Test.hs
diff --git a/Com/Simatime/Serval.scm b/Biz/Serval.scm
index 81f5e13..87cc238 100644
--- a/Com/Simatime/Serval.scm
+++ b/Biz/Serval.scm
@@ -30,17 +30,17 @@
 ;;   - profiles in /nix/var/nix/profiles/per-kit
 ;;   - each of the below commented functions for state manipulation
 ;;
-(define-module (Com Simatime Serval)
+(define-module (Biz Serval)
   #:use-module ((ice-9 getopt-long))
   #:use-module ((ice-9 match)
                 #:select (match))
   #:use-module ((srfi srfi-9)
                 #:select (define-record-type))
-  #:use-module ((Com Simatime Core)
+  #:use-module ((Alpha Core)
                 #:select (second rest fmt prn first comment nil))
-  #:use-module ((Com Simatime Test)
+  #:use-module ((Alpha Test)
                 #:select (testing))
-  #:use-module ((Com Simatime Shell) #:prefix Shell.)
+  #:use-module ((Alpha Shell) #:prefix Shell.)
   #:export (main))
 
 (define *data-dir* "/var/lib/serval")
@@ -50,7 +50,7 @@
 ;; getopt-long sucks
 (define (main args)
   ;; pop first arg if its the executable
-  (let* ([args (if (equal? (first args) "Com/Simatime/Serval.scm")
+  (let* ([args (if (equal? (first args) "Biz/Serval.scm")
                    (rest args)
                    args)]
          [cmd (first args)])
diff --git a/Com/Simatime/buildOS.nix b/Biz/buildOS.nix
index 9e6c2f2..9e6c2f2 100644
--- a/Com/Simatime/buildOS.nix
+++ b/Biz/buildOS.nix
diff --git a/Com/Simatime/fathom.nix b/Biz/fathom.nix
index 40e8b0b..40e8b0b 100644
--- a/Com/Simatime/fathom.nix
+++ b/Biz/fathom.nix
diff --git a/Com/Simatime/firefox.nix b/Biz/firefox.nix
index 12316fb..12316fb 100644
--- a/Com/Simatime/firefox.nix
+++ b/Biz/firefox.nix
diff --git a/Com/Simatime/idea/duree-pitch.org b/Biz/idea/duree-pitch.org
index d4d9d6f..d4d9d6f 100644
--- a/Com/Simatime/idea/duree-pitch.org
+++ b/Biz/idea/duree-pitch.org
diff --git a/Com/Simatime/idea/flash.org b/Biz/idea/flash.org
index 1c392f0..1c392f0 100644
--- a/Com/Simatime/idea/flash.org
+++ b/Biz/idea/flash.org
diff --git a/Com/Simatime/keys/ben.pub b/Biz/keys/ben.pub
index c661508..c661508 100644
--- a/Com/Simatime/keys/ben.pub
+++ b/Biz/keys/ben.pub
diff --git a/Com/Simatime/keys/deploy.pub b/Biz/keys/deploy.pub
index 664a2d9..664a2d9 100644
--- a/Com/Simatime/keys/deploy.pub
+++ b/Biz/keys/deploy.pub
diff --git a/Com/Simatime/keys/nick.pub b/Biz/keys/nick.pub
index 4dc08fb..4dc08fb 100644
--- a/Com/Simatime/keys/nick.pub
+++ b/Biz/keys/nick.pub
diff --git a/Com/Simatime/packages.nix b/Biz/packages.nix
index 4ffbbf8..4ffbbf8 100644
--- a/Com/Simatime/packages.nix
+++ b/Biz/packages.nix
diff --git a/Com/Simatime/users.nix b/Biz/users.nix
index b52043e..b52043e 100644
--- a/Com/Simatime/users.nix
+++ b/Biz/users.nix
diff --git a/Com/Simatime/vpnHosts.nix b/Biz/vpnHosts.nix
index 1a66e92..1a66e92 100644
--- a/Com/Simatime/vpnHosts.nix
+++ b/Biz/vpnHosts.nix
diff --git a/Com/Simatime/Sema.hs b/Control/Concurrent/Sema.hs
index f0f75da..e804cc3 100644
--- a/Com/Simatime/Sema.hs
+++ b/Control/Concurrent/Sema.hs
@@ -1,4 +1,4 @@
-module Com.Simatime.Sema
+module Control.Concurrent.Sema
     ( mapPool
     )
 where
diff --git a/Com/MusicMeetsComics/App.hs b/Hero/App.hs
index 3fa237d..7f55052 100644
--- a/Com/MusicMeetsComics/App.hs
+++ b/Hero/App.hs
@@ -8,14 +8,14 @@
 {-# LANGUAGE TypeFamilies      #-}
 {-# LANGUAGE TypeOperators     #-}
 {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
-module Com.MusicMeetsComics.App where
+module Hero.App where
 
 import           Alpha
 import qualified Clay
-import qualified Com.MusicMeetsComics.Assets as Assets
-import           Com.MusicMeetsComics.Look as Look
-import           Com.MusicMeetsComics.Look.Typography
-import           Com.Simatime.Network
+import qualified Hero.Assets as Assets
+import           Hero.Look as Look
+import           Hero.Look.Typography
+import           Network.RemoteData
 import           Data.Aeson ( ToJSON(..)
                             , FromJSON(..)
                             , genericToJSON
@@ -461,7 +461,7 @@ discoverFooter = footer_
   , div_
     [ css euro, id_ "app-foot-logo", onClick DumpModel ]
     [ a_ [ class_ "social-icon", href_ "#" ] [ img_ [ src_ $ ms $ Assets.icon <> "hero-logo.svg" ]]
-    , span_ [] [ text "© Com.MusicMeetsComics Records, Inc. All Rights Reserved" ]
+    , span_ [] [ text "© Hero Records, Inc. All Rights Reserved" ]
     ]
   ]
   where
diff --git a/Com/MusicMeetsComics/Assets.hs b/Hero/Assets.hs
index f4fabde..06386b8 100644
--- a/Com/MusicMeetsComics/Assets.hs
+++ b/Hero/Assets.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 -- | A module to wrap the CDN and provide convient helper functions to assets.
-module Com.MusicMeetsComics.Assets where
+module Hero.Assets where
 
 import           Protolude
 
diff --git a/Com/MusicMeetsComics/Client.hs b/Hero/Client.hs
index 2361939..9a8fa02 100644
--- a/Com/MusicMeetsComics/Client.hs
+++ b/Hero/Client.hs
@@ -15,9 +15,9 @@
 -- : dep string-quote
 -- : dep text
 -- : dep ghcjs-base
-module Com.MusicMeetsComics.Client where
+module Hero.Client where
 
-import           Com.MusicMeetsComics.App ( Action(..)
+import           Hero.App ( Action(..)
                                           , Comic(..)
                                           , ComicReaderState(..)
                                           , ComicReaderView(..)
@@ -33,7 +33,7 @@ import           Com.MusicMeetsComics.App ( Action(..)
                                           , the404
                                           , routes
                                           )
-import qualified Com.Simatime.Network as Network
+import qualified Network.RemoteData as Network
 import           Data.Aeson ( eitherDecodeStrict )
 import qualified Data.Set as Set
 import qualified GHC.Show as Legacy
diff --git a/Com/MusicMeetsComics/Database.hs b/Hero/Database.hs
index c5a0068..5726f3c 100644
--- a/Com/MusicMeetsComics/Database.hs
+++ b/Hero/Database.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-module Com.MusicMeetsComics.Database
+module Hero.Database
   ( ComicDB
   , getComics
   , load
@@ -10,7 +10,7 @@ module Com.MusicMeetsComics.Database
   )
 where
 
-import           Com.MusicMeetsComics.App
+import           Hero.App
 import           Data.Map                       ( Map )
 import qualified Data.Map                      as Map
 import           Dhall
diff --git a/Com/MusicMeetsComics/Look.hs b/Hero/Look.hs
index f53955c..109ea76 100644
--- a/Com/MusicMeetsComics/Look.hs
+++ b/Hero/Look.hs
@@ -6,14 +6,14 @@
 --
 -- Eventually move make this mostly well-typed. Use this EDSL:
 -- http://fvisser.nl/clay/
-module Com.MusicMeetsComics.Look where
+module Hero.Look where
 
 import           Clay
 import qualified Clay.Flexbox as Flexbox
 import qualified Clay.Media as Media
 import qualified Clay.Render as Clay
 import qualified Clay.Stylesheet as Stylesheet
-import           Com.MusicMeetsComics.Look.Typography as Typo
+import           Hero.Look.Typography as Typo
 import qualified Data.Map as Map
 import qualified Data.Text.Lazy as L
 import           Miso (Attribute, (=:), style_)
diff --git a/Com/MusicMeetsComics/Look/Typography.hs b/Hero/Look/Typography.hs
index 7f3b28d..4d4f976 100644
--- a/Com/MusicMeetsComics/Look/Typography.hs
+++ b/Hero/Look/Typography.hs
@@ -1,12 +1,12 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-module Com.MusicMeetsComics.Look.Typography where
+module Hero.Look.Typography where
 
 import           Alpha
 import           Clay
 import           Clay.Stylesheet                ( key )
-import qualified Com.MusicMeetsComics.Assets   as Assets
+import qualified Hero.Assets   as Assets
 import           Data.Semigroup                 ( (<>) )
 
 main :: Css
diff --git a/Com/MusicMeetsComics/Prod.nix b/Hero/Prod.nix
index 10650ee..10650ee 100644
--- a/Com/MusicMeetsComics/Prod.nix
+++ b/Hero/Prod.nix
diff --git a/Com/MusicMeetsComics/Server.hs b/Hero/Server.hs
index c173bd3..730aada 100644
--- a/Com/MusicMeetsComics/Server.hs
+++ b/Hero/Server.hs
@@ -37,14 +37,14 @@
 -- : dep wai-extra
 -- : dep wai-middleware-metrics
 -- : dep warp
-module Com.MusicMeetsComics.Server where
+module Hero.Server where
 
 import qualified Clay
-import           Com.MusicMeetsComics.App
-import qualified Com.MusicMeetsComics.Assets   as Assets
-import qualified Com.MusicMeetsComics.Database as Database
-import qualified Com.MusicMeetsComics.Look     as Look
-import qualified Com.MusicMeetsComics.Look.Typography
+import           Hero.App
+import qualified Hero.Assets   as Assets
+import qualified Hero.Database as Database
+import qualified Hero.Look     as Look
+import qualified Hero.Look.Typography
                                                as Typography
 import           Data.Aeson
 import           Data.Proxy
@@ -92,7 +92,7 @@ data Config = Config
   } deriving (Generic, Show)
 
 instance Envy.DefConfig Config where
-  defConfig = Config 3000 "_bild/Com.MusicMeetsComics.Client/static"
+  defConfig = Config 3000 "_bild/Hero.Client/static"
 
 instance Envy.FromEnv Config
 
diff --git a/Com/MusicMeetsComics/Service.nix b/Hero/Service.nix
index f0f4227..f0f4227 100644
--- a/Com/MusicMeetsComics/Service.nix
+++ b/Hero/Service.nix
diff --git a/Com/Simatime/Network.hs b/Network/RemoteData.hs
index e47e891..2fe6557 100644
--- a/Com/Simatime/Network.hs
+++ b/Network/RemoteData.hs
@@ -1,7 +1,7 @@
 -- | A port of Kris Jenkins' RemoteData Elm module
 -- <https://github.com/krisajenkins/remotedata>.
 --
-module Com.Simatime.Network where
+module Network.RemoteData where
 
 data RemoteData a b
     = NotAsked
diff --git a/Run/Que/Prod.nix b/Que/Prod.nix
index 97749c8..97749c8 100644
--- a/Run/Que/Prod.nix
+++ b/Que/Prod.nix
diff --git a/Run/Que/Server.hs b/Que/Server.hs
index 0fc9fd1..841cbfa 100644
--- a/Run/Que/Server.hs
+++ b/Que/Server.hs
@@ -21,7 +21,7 @@
 -- : dep stm
 -- : dep unagi-chan
 -- : dep unordered-containers
-module Run.Que.Server
+module Que.Server
   ( main
   )
 where
diff --git a/Run/Que/Server.nix b/Que/Server.nix
index e326483..e326483 100644
--- a/Run/Que/Server.nix
+++ b/Que/Server.nix
diff --git a/Run/Que/Website.hs b/Que/Website.hs
index 52e46f9..e75f2bd 100644
--- a/Run/Que/Website.hs
+++ b/Que/Website.hs
@@ -12,7 +12,7 @@
 -- : dep process
 -- : dep protolude
 -- : dep req
-module Run.Que.Website
+module Que.Website
   ( main
   )
 where
diff --git a/Run/Que/Website.nix b/Que/Website.nix
index 6a24d9d..6a24d9d 100644
--- a/Run/Que/Website.nix
+++ b/Que/Website.nix
diff --git a/Run/Que/apidocs.md b/Que/apidocs.md
index f400889..f400889 100644
--- a/Run/Que/apidocs.md
+++ b/Que/apidocs.md
diff --git a/Run/Que/client.py b/Que/client.py
index 3d9291d..3d9291d 100755
--- a/Run/Que/client.py
+++ b/Que/client.py
diff --git a/Run/Que/index.md b/Que/index.md
index a9db12e..a9db12e 100644
--- a/Run/Que/index.md
+++ b/Que/index.md
diff --git a/Run/Que/quescripts.md b/Que/quescripts.md
index 9a2e6e0..9a2e6e0 100644
--- a/Run/Que/quescripts.md
+++ b/Que/quescripts.md
diff --git a/Run/Que/style.css b/Que/style.css
index f8d1ca4..f8d1ca4 100644
--- a/Run/Que/style.css
+++ b/Que/style.css
diff --git a/Run/Que/tutorial.md b/Que/tutorial.md
index 66ecd3c..66ecd3c 100644
--- a/Run/Que/tutorial.md
+++ b/Que/tutorial.md
diff --git a/README.md b/README.md
index f8b92bd..ea5469c 100644
--- a/README.md
+++ b/README.md
@@ -26,10 +26,10 @@ what code we write, not just how we write it; that is by design.
 
 ## Layout
 
-The source tree maps to the DNS namespace that we own. The purpose of
-this mapping is to keep things organized hierarchically in how they are
-deployed on the Internet. The main 'common' space is `Com.Simatime`,
-other namespaces should be related to their application.
+The source tree maps to the module namespace, and roughly follows the
+Haskell namespace hierarchy (although nothing is enforced). The main
+'common' space is `Biz`, other namespaces should be related to their
+application.
 
 Development aspects should be localized to their sub-namespaces as much
 as possible. Only after sufficient iteration such that interfaces are
diff --git a/Com/Simatime/Shuffle.hs b/System/Random/Shuffle.hs
index 02cd3e0..02cd3e0 100644
--- a/Com/Simatime/Shuffle.hs
+++ b/System/Random/Shuffle.hs
diff --git a/default.nix b/default.nix
index 86d584f..0463bc0 100644
--- a/default.nix
+++ b/default.nix
@@ -4,7 +4,7 @@ let
   bizpkgs = import "${nixpkgs-tar}" { overlays = [ overlay ]; };
   nixos = import "${nixpkgs-tar}/nixos";
   biz = import ./biz.nix { nixpkgs = bizpkgs; };
-  buildOS = import ./Com/Simatime/buildOS.nix nixos;
+  buildOS = import ./Biz/buildOS.nix nixos;
   nixos-mailserver = let ver = "v2.3.0"; in builtins.fetchTarball {
     url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${ver}/nixos-mailserver-${ver}.tar.gz";
     sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919";
@@ -13,20 +13,20 @@ in rec {
   # Cloud infrastructure, always online. Mostly for messaging-related
   # stuff.
   #
-  Com.Simatime.Cloud = buildOS {
+  Biz.Cloud = buildOS {
     enableVpn = true;
     ipAddress = "159.89.128.69";
     configuration = {
       imports = [
-        ./Com/Simatime/packages.nix
-        ./Com/Simatime/users.nix
-        ./Com/Simatime/Cloud/chat.nix
-        ./Com/Simatime/Cloud/git.nix
-        ./Com/Simatime/Cloud/hardware.nix
-        ./Com/Simatime/Cloud/mail.nix
-        ./Com/Simatime/Cloud/networking.nix
-        ./Com/Simatime/Cloud/web.nix
-        ./Com/Simatime/Cloud/znc.nix
+        ./Biz/packages.nix
+        ./Biz/users.nix
+        ./Biz/Cloud/chat.nix
+        ./Biz/Cloud/git.nix
+        ./Biz/Cloud/hardware.nix
+        ./Biz/Cloud/mail.nix
+        ./Biz/Cloud/networking.nix
+        ./Biz/Cloud/web.nix
+        ./Biz/Cloud/znc.nix
         nixos-mailserver
       ];
       networking.hostName = "simatime";
@@ -35,7 +35,7 @@ in rec {
   };
   # Dev machine for work and building stuff.
   #
-  Com.Simatime.Dev = buildOS {
+  Biz.Dev = buildOS {
     enableVpn = true;
     ipAddress = "73.222.221.63";
     deps = {
@@ -43,10 +43,10 @@ in rec {
     };
     configuration = {
       imports = [
-        ./Com/Simatime/packages.nix
-        ./Com/Simatime/users.nix
-        ./Com/Simatime/Dev/configuration.nix
-        ./Com/Simatime/Dev/hardware.nix
+        ./Biz/packages.nix
+        ./Biz/users.nix
+        ./Biz/Dev/configuration.nix
+        ./Biz/Dev/hardware.nix
       ];
       networking.hostName = "lithium";
       networking.domain = "dev.simatime.com";
@@ -54,35 +54,35 @@ in rec {
   };
   # The production server for que.run
   #
-  Run.Que.Prod = buildOS {
+  Que.Prod = buildOS {
     deps = {
-      que-server = Run.Que.Server;
-      que-website = Run.Que.Website;
+      que-server = Que.Server;
+      que-website = Que.Website;
     };
     configuration = {
       imports = [
-        ./Com/Simatime/packages.nix
-        ./Com/Simatime/users.nix
-        ./Run/Que/Server.nix
-        ./Run/Que/Website.nix
-        ./Run/Que/Prod.nix
+        ./Biz/packages.nix
+        ./Biz/users.nix
+        ./Que/Server.nix
+        ./Que/Website.nix
+        ./Que/Prod.nix
       ];
       networking.hostName = "prod.que.run";
       networking.domain = "que.run";
     };
   };
   # Production server for musicmeetscomics.com
-  Com.MusicMeetsComics.Prod = buildOS {
+  Hero.Prod = buildOS {
     deps = {
-      herocomics-server = Com.MusicMeetsComics.Server;
-      herocomics-client = Com.MusicMeetsComics.Client;
+      herocomics-server = Hero.Server;
+      herocomics-client = Hero.Client;
     };
     configuration = {
       imports = [
-        ./Com/Simatime/packages.nix
-        ./Com/Simatime/users.nix
-        ./Com/MusicMeetsComics/Service.nix
-        ./Com/MusicMeetsComics/Prod.nix
+        ./Biz/packages.nix
+        ./Biz/users.nix
+        ./Hero/Service.nix
+        ./Hero/Prod.nix
       ];
       networking.hostName = "prod.herocomics.app";
       networking.domain = "herocomcis.app";
@@ -90,12 +90,12 @@ in rec {
   };
   # Haskell targets
   #
-  Com.InfluencedByBooks.Server = biz.buildGhc Com/InfluencedByBooks/Server.hs;
-  Com.InfluencedByBooks.Client = biz.buildGhcjs Com/InfluencedByBooks/Client.hs;
-  Com.MusicMeetsComics.Server = biz.buildGhc Com/MusicMeetsComics/Server.hs;
-  Com.MusicMeetsComics.Client = biz.buildGhcjs Com/MusicMeetsComics/Client.hs;
-  Run.Que.Server = biz.buildGhc ./Run/Que/Server.hs;
-  Run.Que.Website = biz.buildGhc ./Run/Que/Website.hs;
+  Biz.Ibb.Server = biz.buildGhc Biz/Ibb/Server.hs;
+  Biz.Ibb.Client = biz.buildGhcjs Biz/Ibb/Client.hs;
+  Hero.Server = biz.buildGhc Hero/Server.hs;
+  Hero.Client = biz.buildGhcjs Hero/Client.hs;
+  Que.Server = biz.buildGhc ./Que/Server.hs;
+  Que.Website = biz.buildGhc ./Que/Website.hs;
   # Development environment
   repl = biz.globalGhc;
   # Fall through to any of our overlay packages
diff --git a/push-all b/push-all
index dcc4df2..8c33d91 100755
--- a/push-all
+++ b/push-all
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 set -ex
 
-bild Com.Simatime.Cloud
-push Com.Simatime.Cloud simatime.com
+bild Biz.Cloud
+push Biz.Cloud simatime.com
 
-bild Com.Simatime.Dev
-push Com.Simatime.Dev dev.simatime.com
+bild Biz.Dev
+push Biz.Dev dev.simatime.com
 
-bild Run.Que.Prod
-push Run.Que.Prod que.run
+bild Que.Prod
+push Que.Prod que.run