merged restructure branch

src/App/Gui.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE TemplateHaskell #-} -- needed for makeLenses
+{-# LANGUAGE TemplateHaskell #-}
 
 module Gui (runEditor) where
 
@@ -7,8 +7,8 @@ module Gui (runEditor) where
 
 ---- Brick ----
 import           Brick
-import Brick.Markup (markup)
 import qualified Brick.Main             as BrickMain
+import           Brick.Markup           (markup)
 import qualified Brick.Widgets.Edit     as EditWidget
 -- The underlying terminal package Brick is based upon
 import qualified Graphics.Vty           as Vty
@@ -18,13 +18,13 @@ import Data.Text (pack, singleton)
 import           Data.Text.Markup       (Markup, (@@))
 
 ---- Various ----
+import           Control.Monad.IO.Class (liftIO)
+import           Data.List
+import           Data.Maybe
+import           Data.Monoid            (mempty, (<>))
+import           Data.Tuple
 import           Lens.Micro             ((^.))
 import           Lens.Micro.TH          (makeLenses)
-import Control.Monad.IO.Class (liftIO)
-import Data.Monoid (mempty, (<>))
-import Data.Maybe
-import Data.List
-import Data.Tuple