diff --git a/ghcup.cabal b/ghcup.cabal
index 4363b49..c916693 100644
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -261,7 +261,7 @@ library ghcup-optparse
     GHCup.OptParse.Upgrade
     GHCup.OptParse.Whereis
 
-  hs-source-dirs:     app/ghcup
+  hs-source-dirs:     lib-opt
   default-language:   Haskell2010
   default-extensions:
     LambdaCase
@@ -284,12 +284,6 @@ library ghcup-optparse
 
   if (flag(tui) && !os(windows))
     cpp-options:   -DBRICK
-    other-modules: BrickMain
-    build-depends:
-      , brick         ^>=1.5
-      , transformers  ^>=0.5
-      , unix          ^>=2.7
-      , vty           ^>=5.37
 
   if os(windows)
     cpp-options: -DIS_WINDOWS
@@ -300,26 +294,6 @@ library ghcup-optparse
 executable ghcup
   import:             app-common-depends
   main-is:            Main.hs
-  other-modules:
-    GHCup.OptParse
-    GHCup.OptParse.ChangeLog
-    GHCup.OptParse.Common
-    GHCup.OptParse.Compile
-    GHCup.OptParse.Config
-    GHCup.OptParse.DInfo
-    GHCup.OptParse.GC
-    GHCup.OptParse.Install
-    GHCup.OptParse.List
-    GHCup.OptParse.Nuke
-    GHCup.OptParse.Prefetch
-    GHCup.OptParse.Rm
-    GHCup.OptParse.Run
-    GHCup.OptParse.Set
-    GHCup.OptParse.Test
-    GHCup.OptParse.ToolRequirements
-    GHCup.OptParse.UnSet
-    GHCup.OptParse.Upgrade
-    GHCup.OptParse.Whereis
 
   hs-source-dirs:     app/ghcup
   default-language:   Haskell2010
@@ -335,7 +309,7 @@ executable ghcup
 
   ghc-options:
     -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
-    -fwarn-incomplete-record-updates -threaded
+    -fwarn-incomplete-record-updates
 
   build-depends:
     , ghcup
diff --git a/app/ghcup/GHCup/OptParse.hs b/lib-opt/GHCup/OptParse.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse.hs
rename to lib-opt/GHCup/OptParse.hs
diff --git a/app/ghcup/GHCup/OptParse/ChangeLog.hs b/lib-opt/GHCup/OptParse/ChangeLog.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/ChangeLog.hs
rename to lib-opt/GHCup/OptParse/ChangeLog.hs
diff --git a/app/ghcup/GHCup/OptParse/Common.hs b/lib-opt/GHCup/OptParse/Common.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Common.hs
rename to lib-opt/GHCup/OptParse/Common.hs
diff --git a/app/ghcup/GHCup/OptParse/Compile.hs b/lib-opt/GHCup/OptParse/Compile.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Compile.hs
rename to lib-opt/GHCup/OptParse/Compile.hs
diff --git a/app/ghcup/GHCup/OptParse/Config.hs b/lib-opt/GHCup/OptParse/Config.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Config.hs
rename to lib-opt/GHCup/OptParse/Config.hs
diff --git a/app/ghcup/GHCup/OptParse/DInfo.hs b/lib-opt/GHCup/OptParse/DInfo.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/DInfo.hs
rename to lib-opt/GHCup/OptParse/DInfo.hs
diff --git a/app/ghcup/GHCup/OptParse/GC.hs b/lib-opt/GHCup/OptParse/GC.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/GC.hs
rename to lib-opt/GHCup/OptParse/GC.hs
diff --git a/app/ghcup/GHCup/OptParse/Install.hs b/lib-opt/GHCup/OptParse/Install.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Install.hs
rename to lib-opt/GHCup/OptParse/Install.hs
diff --git a/app/ghcup/GHCup/OptParse/List.hs b/lib-opt/GHCup/OptParse/List.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/List.hs
rename to lib-opt/GHCup/OptParse/List.hs
diff --git a/app/ghcup/GHCup/OptParse/Nuke.hs b/lib-opt/GHCup/OptParse/Nuke.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Nuke.hs
rename to lib-opt/GHCup/OptParse/Nuke.hs
diff --git a/app/ghcup/GHCup/OptParse/Prefetch.hs b/lib-opt/GHCup/OptParse/Prefetch.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Prefetch.hs
rename to lib-opt/GHCup/OptParse/Prefetch.hs
diff --git a/app/ghcup/GHCup/OptParse/Rm.hs b/lib-opt/GHCup/OptParse/Rm.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Rm.hs
rename to lib-opt/GHCup/OptParse/Rm.hs
diff --git a/app/ghcup/GHCup/OptParse/Run.hs b/lib-opt/GHCup/OptParse/Run.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Run.hs
rename to lib-opt/GHCup/OptParse/Run.hs
diff --git a/app/ghcup/GHCup/OptParse/Set.hs b/lib-opt/GHCup/OptParse/Set.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Set.hs
rename to lib-opt/GHCup/OptParse/Set.hs
diff --git a/app/ghcup/GHCup/OptParse/Test.hs b/lib-opt/GHCup/OptParse/Test.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Test.hs
rename to lib-opt/GHCup/OptParse/Test.hs
diff --git a/app/ghcup/GHCup/OptParse/ToolRequirements.hs b/lib-opt/GHCup/OptParse/ToolRequirements.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/ToolRequirements.hs
rename to lib-opt/GHCup/OptParse/ToolRequirements.hs
diff --git a/app/ghcup/GHCup/OptParse/UnSet.hs b/lib-opt/GHCup/OptParse/UnSet.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/UnSet.hs
rename to lib-opt/GHCup/OptParse/UnSet.hs
diff --git a/app/ghcup/GHCup/OptParse/Upgrade.hs b/lib-opt/GHCup/OptParse/Upgrade.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Upgrade.hs
rename to lib-opt/GHCup/OptParse/Upgrade.hs
diff --git a/app/ghcup/GHCup/OptParse/Whereis.hs b/lib-opt/GHCup/OptParse/Whereis.hs
similarity index 100%
rename from app/ghcup/GHCup/OptParse/Whereis.hs
rename to lib-opt/GHCup/OptParse/Whereis.hs