diff --git a/dex.cabal b/dex.cabal
index b58b178dc..6a5090c5c 100644
--- a/dex.cabal
+++ b/dex.cabal
@@ -27,10 +27,6 @@ flag optimized
   description:         Enables GHC optimizations
   default:             False
 
-flag llvm-head
-  description:         Use the bleeding-edge version of LLVM
-  default:             False
-
 flag foreign
   description:         Build the C interface to Dex
   default:             False
@@ -42,7 +38,6 @@ flag debug
 library
   exposed-modules:     AbstractSyntax
                      -- , Builder
-                     -- , CUDA
                      -- , CheapReduction
                      -- , CheckType
                      , ConcreteSyntax
@@ -50,44 +45,28 @@ library
                      -- , DPS
                      , Err
                      -- , Generalize
-                     -- , Imp
-                     -- , ImpToLLVM
                      , IncState
                      , Inference
                      -- , Inline
-                     -- , JAX.Concrete
-                     -- , JAX.Rename
-                     -- , JAX.ToSimp
-                     -- , LLVM.Link
-                     -- , LLVM.Compile
-                     -- , LLVM.CUDA
-                     -- , LLVM.Shims
                      , Lexing
-                     -- , Linearize
                      , MonadUtil
                      , MTL1
                      , Name
-                     -- , Occurrence
-                     -- , OccAnalysis
-                     -- , Optimize
-                     -- , PeepholeOptimize
                      , PPrint
                      , RawName
-                     -- , Runtime
                      -- , RuntimePrint
                      -- , Serialize
                      -- , Simplify
-                      , Subst
+                     , Subst
                      , SourceRename
                      , SourceIdTraversal
-                     , TopLevel2
+                     , TopLevel
                      -- , Transpose
                      , Types.Simple
                      , Types.Complicated
-                     -- , Types.Imp
                      , Types.Primitives
                      , Types.Source
-                     , Types.Top2
+                     , Types.Top
                      -- , QueryType
                      , QueryTypePure
                      , Util
@@ -103,8 +82,6 @@ library
                      , cryptonite
                      , exceptions
                      , hashable
-                     , llvm-hs
-                     , llvm-hs-pure
                      , mtl
                      , scientific
                      , transformers
@@ -272,7 +249,6 @@ foreign-library Dex
                      , base
                      , bytestring
                      , containers
-                     , llvm-hs
                      , mtl
                      , random
                      , text
diff --git a/src/old/Builder.hs b/old/Builder.hs
similarity index 100%
rename from src/old/Builder.hs
rename to old/Builder.hs
diff --git a/src/lib/CUDA.hs b/old/CUDA.hs
similarity index 100%
rename from src/lib/CUDA.hs
rename to old/CUDA.hs
diff --git a/src/old/CheapReduction.hs b/old/CheapReduction.hs
similarity index 100%
rename from src/old/CheapReduction.hs
rename to old/CheapReduction.hs
diff --git a/src/old/Core.hs b/old/Core.hs
similarity index 100%
rename from src/old/Core.hs
rename to old/Core.hs
diff --git a/src/old/DPS.hs b/old/DPS.hs
similarity index 100%
rename from src/old/DPS.hs
rename to old/DPS.hs
diff --git a/src/old/Export.hs b/old/Export.hs
similarity index 100%
rename from src/old/Export.hs
rename to old/Export.hs
diff --git a/src/old/Generalize.hs b/old/Generalize.hs
similarity index 100%
rename from src/old/Generalize.hs
rename to old/Generalize.hs
diff --git a/src/old/Imp.hs b/old/Imp.hs
similarity index 100%
rename from src/old/Imp.hs
rename to old/Imp.hs
diff --git a/src/old/Imp/Builder.hs b/old/Imp/Builder.hs
similarity index 100%
rename from src/old/Imp/Builder.hs
rename to old/Imp/Builder.hs
diff --git a/src/old/Imp/Optimize.hs b/old/Imp/Optimize.hs
similarity index 100%
rename from src/old/Imp/Optimize.hs
rename to old/Imp/Optimize.hs
diff --git a/src/old/ImpToLLVM.hs b/old/ImpToLLVM.hs
similarity index 100%
rename from src/old/ImpToLLVM.hs
rename to old/ImpToLLVM.hs
diff --git a/src/lib/JAX/Concrete.hs b/old/JAX/Concrete.hs
similarity index 100%
rename from src/lib/JAX/Concrete.hs
rename to old/JAX/Concrete.hs
diff --git a/src/lib/JAX/Rename.hs b/old/JAX/Rename.hs
similarity index 100%
rename from src/lib/JAX/Rename.hs
rename to old/JAX/Rename.hs
diff --git a/src/lib/JAX/ToSimp.hs b/old/JAX/ToSimp.hs
similarity index 100%
rename from src/lib/JAX/ToSimp.hs
rename to old/JAX/ToSimp.hs
diff --git a/src/lib/LLVM/CUDA.hs b/old/LLVM/CUDA.hs
similarity index 100%
rename from src/lib/LLVM/CUDA.hs
rename to old/LLVM/CUDA.hs
diff --git a/src/lib/LLVM/Compile.hs b/old/LLVM/Compile.hs
similarity index 100%
rename from src/lib/LLVM/Compile.hs
rename to old/LLVM/Compile.hs
diff --git a/src/lib/LLVM/Link.hs b/old/LLVM/Link.hs
similarity index 100%
rename from src/lib/LLVM/Link.hs
rename to old/LLVM/Link.hs
diff --git a/src/lib/LLVM/Shims.hs b/old/LLVM/Shims.hs
similarity index 100%
rename from src/lib/LLVM/Shims.hs
rename to old/LLVM/Shims.hs
diff --git a/src/lib/Linearize.hs b/old/Linearize.hs
similarity index 100%
rename from src/lib/Linearize.hs
rename to old/Linearize.hs
diff --git a/src/old/MLIR/Eval.hs b/old/MLIR/Eval.hs
similarity index 100%
rename from src/old/MLIR/Eval.hs
rename to old/MLIR/Eval.hs
diff --git a/src/old/MLIR/Lower.hs b/old/MLIR/Lower.hs
similarity index 100%
rename from src/old/MLIR/Lower.hs
rename to old/MLIR/Lower.hs
diff --git a/src/lib/OccAnalysis.hs b/old/OccAnalysis.hs
similarity index 100%
rename from src/lib/OccAnalysis.hs
rename to old/OccAnalysis.hs
diff --git a/src/lib/Occurrence.hs b/old/Occurrence.hs
similarity index 100%
rename from src/lib/Occurrence.hs
rename to old/Occurrence.hs
diff --git a/src/lib/Optimize.hs b/old/Optimize.hs
similarity index 100%
rename from src/lib/Optimize.hs
rename to old/Optimize.hs
diff --git a/src/old/Parallelize.hs b/old/Parallelize.hs
similarity index 100%
rename from src/old/Parallelize.hs
rename to old/Parallelize.hs
diff --git a/src/lib/PeepholeOptimize.hs b/old/PeepholeOptimize.hs
similarity index 100%
rename from src/lib/PeepholeOptimize.hs
rename to old/PeepholeOptimize.hs
diff --git a/src/old/QueryType.hs b/old/QueryType.hs
similarity index 100%
rename from src/old/QueryType.hs
rename to old/QueryType.hs
diff --git a/src/old/Runtime.hs b/old/Runtime.hs
similarity index 100%
rename from src/old/Runtime.hs
rename to old/Runtime.hs
diff --git a/src/old/Simplify.hs b/old/Simplify.hs
similarity index 100%
rename from src/old/Simplify.hs
rename to old/Simplify.hs
diff --git a/src/old/Top.hs b/old/Top.hs
similarity index 100%
rename from src/old/Top.hs
rename to old/Top.hs
diff --git a/src/old/TopLevel.hs b/old/TopLevel.hs
similarity index 100%
rename from src/old/TopLevel.hs
rename to old/TopLevel.hs
diff --git a/src/lib/Transpose.hs b/old/Transpose.hs
similarity index 100%
rename from src/lib/Transpose.hs
rename to old/Transpose.hs
diff --git a/src/lib/Types/Imp.hs b/old/TypesImp.hs
similarity index 100%
rename from src/lib/Types/Imp.hs
rename to old/TypesImp.hs
diff --git a/src/lib/Vectorize.hs b/old/Vectorize.hs
similarity index 100%
rename from src/lib/Vectorize.hs
rename to old/Vectorize.hs
diff --git a/src/lib/work-stealing.c b/old/work-stealing.c
similarity index 100%
rename from src/lib/work-stealing.c
rename to old/work-stealing.c
diff --git a/src/dex.hs b/src/dex.hs
index 579a587ca..47c77e9d4 100644
--- a/src/dex.hs
+++ b/src/dex.hs
@@ -16,7 +16,7 @@ import qualified System.Console.ANSI as ANSI
 import System.Console.ANSI hiding (Color)
 
 import Types.Source
-import TopLevel2
+import TopLevel
 import ConcreteSyntax (parseSourceBlocks)
 import PPrint
 import Util (readFileText)
diff --git a/src/lib/Inference.hs b/src/lib/Inference.hs
index 29c3cfe25..0a69971a9 100644
--- a/src/lib/Inference.hs
+++ b/src/lib/Inference.hs
@@ -36,7 +36,7 @@ import Types.Primitives
 import qualified Types.Source as S
 import Subst
 import Types.Source hiding (ConName (..), TCName (..), CTopDecl)
-import Types.Top2
+import Types.Top
 import Util hiding (group)
 
 -- === Top-level interface ===
diff --git a/src/lib/QueryTypePure.hs b/src/lib/QueryTypePure.hs
index 1c89738f1..a07444442 100644
--- a/src/lib/QueryTypePure.hs
+++ b/src/lib/QueryTypePure.hs
@@ -9,7 +9,7 @@ module QueryTypePure where
 import Types.Primitives
 import Types.Simple
 import Types.Complicated
-import Types.Top2
+import Types.Top
 import Name
 
 class HasType (e::E) where
diff --git a/src/lib/SourceRename.hs b/src/lib/SourceRename.hs
index 7d3b5c52b..4e2d0979d 100644
--- a/src/lib/SourceRename.hs
+++ b/src/lib/SourceRename.hs
@@ -22,7 +22,7 @@ import MTL1
 import PPrint
 import Types.Source
 import Types.Primitives
-import Types.Top2
+import Types.Top
 
 renameSourceNames :: (Fallible m, TopLogger m) => UTopDecl -> m UTopDecl
 renameSourceNames decl = liftRenamer $ sourceRenameTop decl
diff --git a/src/lib/TopLevel2.hs b/src/lib/TopLevel.hs
similarity index 99%
rename from src/lib/TopLevel2.hs
rename to src/lib/TopLevel.hs
index 48ab5e48b..1f75e44dd 100644
--- a/src/lib/TopLevel2.hs
+++ b/src/lib/TopLevel.hs
@@ -6,7 +6,7 @@
 
 {-# LANGUAGE UndecidableInstances #-}
 
-module TopLevel2 (
+module TopLevel (
   EvalConfig (..), TopperM, runTopperM, evalSourceBlockRepl, OptLevel (..),
   LibPath (..), initTopState, ExitStatus (..)) where
 
@@ -25,7 +25,7 @@ import PPrint
 import Types.Complicated
 import Types.Primitives
 import Types.Source hiding (CTopDecl)
-import Types.Top2
+import Types.Top
 
 -- === top-level monad ===
 
diff --git a/src/lib/Types/Top2.hs b/src/lib/Types/Top.hs
similarity index 99%
rename from src/lib/Types/Top2.hs
rename to src/lib/Types/Top.hs
index cfbfc52ed..309592481 100644
--- a/src/lib/Types/Top2.hs
+++ b/src/lib/Types/Top.hs
@@ -9,7 +9,7 @@
 
 -- Top-level data types
 
-module Types.Top2 where
+module Types.Top where
 
 import Data.Functor ((<&>))
 import Data.Hashable