diff --git a/shf/fcore/search-list/dfa-gen.sml b/dfa-gen/dfa-gen.sml
similarity index 100%
rename from shf/fcore/search-list/dfa-gen.sml
rename to dfa-gen/dfa-gen.sml
diff --git a/shf/fcore.mlb b/shf/fcore.mlb
index d6d5982..2d4952b 100644
--- a/shf/fcore.mlb
+++ b/shf/fcore.mlb
@@ -3,6 +3,7 @@ $(SML_LIB)/basis/basis.mlb
 (* LIBRARIES (purely functional) *)
 ../brolib-sml/src/line_gap.sml
 ../cozette-sml/fonts-with-z-index/cozette-ascii.mlb
+../dfa-gen/dfa-gen.sml
 
 (* FUNCTIONAL CORE *)
 fcore/bin-search.sml
@@ -10,9 +11,8 @@ fcore/bin-search.sml
 ann
   "allowVectorExps true"
 in
-  fcore/persistent-vector.sml
+  fcore/search-list/persistent-vector.sml
 end
-fcore/search-list/dfa-gen.sml
 fcore/search-list/search-list.sml
 
 message-types/input-msg.sml
diff --git a/shf/fcore/persistent-vector.sml b/shf/fcore/search-list/persistent-vector.sml
similarity index 100%
rename from shf/fcore/persistent-vector.sml
rename to shf/fcore/search-list/persistent-vector.sml