diff --git a/src/base-term/Base_types.ml b/src/arith/base-term/Base_types.ml
similarity index 100%
rename from src/base-term/Base_types.ml
rename to src/arith/base-term/Base_types.ml
diff --git a/src/base-term/CCHet.ml b/src/arith/base-term/CCHet.ml
similarity index 100%
rename from src/base-term/CCHet.ml
rename to src/arith/base-term/CCHet.ml
diff --git a/src/base-term/CCHet.mli b/src/arith/base-term/CCHet.mli
similarity index 100%
rename from src/base-term/CCHet.mli
rename to src/arith/base-term/CCHet.mli
diff --git a/src/base-term/Config.ml b/src/arith/base-term/Config.ml
similarity index 100%
rename from src/base-term/Config.ml
rename to src/arith/base-term/Config.ml
diff --git a/src/base-term/Config.mli b/src/arith/base-term/Config.mli
similarity index 100%
rename from src/base-term/Config.mli
rename to src/arith/base-term/Config.mli
diff --git a/src/base-term/Hashcons.ml b/src/arith/base-term/Hashcons.ml
similarity index 100%
rename from src/base-term/Hashcons.ml
rename to src/arith/base-term/Hashcons.ml
diff --git a/src/base-term/ID.ml b/src/arith/base-term/ID.ml
similarity index 100%
rename from src/base-term/ID.ml
rename to src/arith/base-term/ID.ml
diff --git a/src/base-term/ID.mli b/src/arith/base-term/ID.mli
similarity index 100%
rename from src/base-term/ID.mli
rename to src/arith/base-term/ID.mli
diff --git a/src/base-term/Model.ml b/src/arith/base-term/Model.ml
similarity index 100%
rename from src/base-term/Model.ml
rename to src/arith/base-term/Model.ml
diff --git a/src/base-term/Model.mli b/src/arith/base-term/Model.mli
similarity index 100%
rename from src/base-term/Model.mli
rename to src/arith/base-term/Model.mli
diff --git a/src/base-term/Sidekick_base_term.ml b/src/arith/base-term/Sidekick_base_term.ml
similarity index 100%
rename from src/base-term/Sidekick_base_term.ml
rename to src/arith/base-term/Sidekick_base_term.ml
diff --git a/src/base-term/dune b/src/arith/base-term/dune
similarity index 85%
rename from src/base-term/dune
rename to src/arith/base-term/dune
index 286c652d..166a4547 100644
--- a/src/base-term/dune
+++ b/src/arith/base-term/dune
@@ -1,6 +1,6 @@
 (library
  (name sidekick_base_term)
- (public_name sidekick.base-term)
+ (public_name sidekick-arith.base-term)
  (synopsis "Basic term definitions for the standalone SMT solver")
  (libraries containers sidekick.core sidekick.util sidekick-arith.lra zarith)
  (flags :standard -w -32 -open Sidekick_util))
diff --git a/src/arith/lra/dune b/src/arith/lra/dune
index efe280aa..10ef35b5 100644
--- a/src/arith/lra/dune
+++ b/src/arith/lra/dune
@@ -3,5 +3,5 @@
   (name sidekick_arith_lra)
   (public_name sidekick-arith.lra)
   (optional) ; only if deps present
-  (flags :standard -warn-error -a+8 -open Sidekick_util)
+  (flags :standard -warn-error -a+8 -w -32 -open Sidekick_util)
   (libraries containers sidekick.core zarith))
diff --git a/src/main/dune b/src/main/dune
index 188312bd..77c68d7a 100644
--- a/src/main/dune
+++ b/src/main/dune
@@ -4,7 +4,7 @@
  (name main)
  (public_name sidekick)
  (package sidekick-bin)
- (libraries containers iter result msat sidekick.core sidekick.base-term
+ (libraries containers iter result msat sidekick.core sidekick-arith.base-term
    sidekick.msat-solver sidekick-bin.smtlib)
  (flags :standard -safe-string -color always -open Sidekick_util))
 
diff --git a/src/mini-cc/dune b/src/mini-cc/dune
index 0ab94a3d..e20dc525 100644
--- a/src/mini-cc/dune
+++ b/src/mini-cc/dune
@@ -2,4 +2,4 @@
  (name Sidekick_mini_cc)
  (public_name sidekick.mini-cc)
  (libraries containers iter sidekick.core sidekick.util)
- (flags :standard -open Sidekick_util))
+ (flags :standard -warn-error -a+8 -w -32 -open Sidekick_util))
diff --git a/src/mini-cc/tests/dune b/src/mini-cc/tests/dune
index dea37b2f..518c6b27 100644
--- a/src/mini-cc/tests/dune
+++ b/src/mini-cc/tests/dune
@@ -1,4 +1,4 @@
 (tests
  (names tests)
- (libraries sidekick.mini-cc sidekick.base-term alcotest)
+ (libraries sidekick.mini-cc sidekick-arith.base-term alcotest)
  (modes native))
diff --git a/src/smtlib/dune b/src/smtlib/dune
index 2481585f..e3230bbf 100644
--- a/src/smtlib/dune
+++ b/src/smtlib/dune
@@ -2,6 +2,6 @@
  (name sidekick_smtlib)
  (public_name sidekick-bin.smtlib)
  (libraries containers zarith msat sidekick.core sidekick.util
-   sidekick.msat-solver sidekick.base-term sidekick.th-bool-static
+   sidekick.msat-solver sidekick-arith.base-term sidekick.th-bool-static
    sidekick.mini-cc sidekick.th-data sidekick-arith.lra msat.backend smtlib-utils)
  (flags :standard -warn-error -a+8 -open Sidekick_util))