diff --git a/macaw.cabal b/base/macaw-base.cabal
similarity index 98%
rename from macaw.cabal
rename to base/macaw-base.cabal
index 6d4a31cc..83393750 100644
--- a/macaw.cabal
+++ b/base/macaw-base.cabal
@@ -1,4 +1,4 @@
-name: macaw
+name: macaw-base
 version: 0.0.1
 author: Galois, Inc.
 maintainer: jhendrix@galois.com
diff --git a/src/Data/Macaw/AbsDomain/AbsState.hs b/base/src/Data/Macaw/AbsDomain/AbsState.hs
similarity index 100%
rename from src/Data/Macaw/AbsDomain/AbsState.hs
rename to base/src/Data/Macaw/AbsDomain/AbsState.hs
diff --git a/src/Data/Macaw/AbsDomain/JumpBounds.hs b/base/src/Data/Macaw/AbsDomain/JumpBounds.hs
similarity index 100%
rename from src/Data/Macaw/AbsDomain/JumpBounds.hs
rename to base/src/Data/Macaw/AbsDomain/JumpBounds.hs
diff --git a/src/Data/Macaw/AbsDomain/Refine.hs b/base/src/Data/Macaw/AbsDomain/Refine.hs
similarity index 100%
rename from src/Data/Macaw/AbsDomain/Refine.hs
rename to base/src/Data/Macaw/AbsDomain/Refine.hs
diff --git a/src/Data/Macaw/AbsDomain/StridedInterval.hs b/base/src/Data/Macaw/AbsDomain/StridedInterval.hs
similarity index 100%
rename from src/Data/Macaw/AbsDomain/StridedInterval.hs
rename to base/src/Data/Macaw/AbsDomain/StridedInterval.hs
diff --git a/src/Data/Macaw/Architecture/Info.hs b/base/src/Data/Macaw/Architecture/Info.hs
similarity index 100%
rename from src/Data/Macaw/Architecture/Info.hs
rename to base/src/Data/Macaw/Architecture/Info.hs
diff --git a/src/Data/Macaw/Architecture/Syscall.hs b/base/src/Data/Macaw/Architecture/Syscall.hs
similarity index 100%
rename from src/Data/Macaw/Architecture/Syscall.hs
rename to base/src/Data/Macaw/Architecture/Syscall.hs
diff --git a/src/Data/Macaw/CFG.hs b/base/src/Data/Macaw/CFG.hs
similarity index 100%
rename from src/Data/Macaw/CFG.hs
rename to base/src/Data/Macaw/CFG.hs
diff --git a/src/Data/Macaw/CFG/App.hs b/base/src/Data/Macaw/CFG/App.hs
similarity index 100%
rename from src/Data/Macaw/CFG/App.hs
rename to base/src/Data/Macaw/CFG/App.hs
diff --git a/src/Data/Macaw/CFG/Block.hs b/base/src/Data/Macaw/CFG/Block.hs
similarity index 100%
rename from src/Data/Macaw/CFG/Block.hs
rename to base/src/Data/Macaw/CFG/Block.hs
diff --git a/src/Data/Macaw/CFG/Core.hs b/base/src/Data/Macaw/CFG/Core.hs
similarity index 100%
rename from src/Data/Macaw/CFG/Core.hs
rename to base/src/Data/Macaw/CFG/Core.hs
diff --git a/src/Data/Macaw/CFG/DemandSet.hs b/base/src/Data/Macaw/CFG/DemandSet.hs
similarity index 100%
rename from src/Data/Macaw/CFG/DemandSet.hs
rename to base/src/Data/Macaw/CFG/DemandSet.hs
diff --git a/src/Data/Macaw/CFG/Rewriter.hs b/base/src/Data/Macaw/CFG/Rewriter.hs
similarity index 100%
rename from src/Data/Macaw/CFG/Rewriter.hs
rename to base/src/Data/Macaw/CFG/Rewriter.hs
diff --git a/src/Data/Macaw/DebugLogging.hs b/base/src/Data/Macaw/DebugLogging.hs
similarity index 100%
rename from src/Data/Macaw/DebugLogging.hs
rename to base/src/Data/Macaw/DebugLogging.hs
diff --git a/src/Data/Macaw/Discovery.hs b/base/src/Data/Macaw/Discovery.hs
similarity index 100%
rename from src/Data/Macaw/Discovery.hs
rename to base/src/Data/Macaw/Discovery.hs
diff --git a/src/Data/Macaw/Discovery/AbsEval.hs b/base/src/Data/Macaw/Discovery/AbsEval.hs
similarity index 100%
rename from src/Data/Macaw/Discovery/AbsEval.hs
rename to base/src/Data/Macaw/Discovery/AbsEval.hs
diff --git a/src/Data/Macaw/Discovery/State.hs b/base/src/Data/Macaw/Discovery/State.hs
similarity index 100%
rename from src/Data/Macaw/Discovery/State.hs
rename to base/src/Data/Macaw/Discovery/State.hs
diff --git a/src/Data/Macaw/Dwarf.hs b/base/src/Data/Macaw/Dwarf.hs
similarity index 100%
rename from src/Data/Macaw/Dwarf.hs
rename to base/src/Data/Macaw/Dwarf.hs
diff --git a/src/Data/Macaw/Fold.hs b/base/src/Data/Macaw/Fold.hs
similarity index 100%
rename from src/Data/Macaw/Fold.hs
rename to base/src/Data/Macaw/Fold.hs
diff --git a/src/Data/Macaw/GaloisDwarf.hs b/base/src/Data/Macaw/GaloisDwarf.hs
similarity index 100%
rename from src/Data/Macaw/GaloisDwarf.hs
rename to base/src/Data/Macaw/GaloisDwarf.hs
diff --git a/src/Data/Macaw/Memory.hs b/base/src/Data/Macaw/Memory.hs
similarity index 100%
rename from src/Data/Macaw/Memory.hs
rename to base/src/Data/Macaw/Memory.hs
diff --git a/src/Data/Macaw/Memory/ElfLoader.hs b/base/src/Data/Macaw/Memory/ElfLoader.hs
similarity index 100%
rename from src/Data/Macaw/Memory/ElfLoader.hs
rename to base/src/Data/Macaw/Memory/ElfLoader.hs
diff --git a/src/Data/Macaw/Memory/Permissions.hs b/base/src/Data/Macaw/Memory/Permissions.hs
similarity index 100%
rename from src/Data/Macaw/Memory/Permissions.hs
rename to base/src/Data/Macaw/Memory/Permissions.hs
diff --git a/src/Data/Macaw/Types.hs b/base/src/Data/Macaw/Types.hs
similarity index 100%
rename from src/Data/Macaw/Types.hs
rename to base/src/Data/Macaw/Types.hs
diff --git a/macaw-symbolic/macaw-symbolic.cabal b/symbolic/macaw-symbolic.cabal
similarity index 94%
rename from macaw-symbolic/macaw-symbolic.cabal
rename to symbolic/macaw-symbolic.cabal
index cd914ee5..8cdda92a 100644
--- a/macaw-symbolic/macaw-symbolic.cabal
+++ b/symbolic/macaw-symbolic.cabal
@@ -11,7 +11,7 @@ library
                 containers,
                 crucible,
                 lens,
-                macaw,
+                macaw-base,
                 mtl,
                 parameterized-utils,
                 text
diff --git a/macaw-symbolic/src/Data/Macaw/Symbolic.hs b/symbolic/src/Data/Macaw/Symbolic.hs
similarity index 100%
rename from macaw-symbolic/src/Data/Macaw/Symbolic.hs
rename to symbolic/src/Data/Macaw/Symbolic.hs
diff --git a/macaw-symbolic/src/Data/Macaw/Symbolic/App.hs b/symbolic/src/Data/Macaw/Symbolic/App.hs
similarity index 100%
rename from macaw-symbolic/src/Data/Macaw/Symbolic/App.hs
rename to symbolic/src/Data/Macaw/Symbolic/App.hs