diff --git a/fontbe/src/features.rs b/fontbe/src/features.rs
index ee2b75b29..5c762e457 100644
--- a/fontbe/src/features.rs
+++ b/fontbe/src/features.rs
@@ -39,6 +39,11 @@ use crate::{
     orchestration::{AnyWorkId, BeWork, Context, FeaAst, FeaRsKerns, FeaRsMarks, WorkId},
 };
 
+mod kern;
+mod marks;
+pub use kern::{create_gather_ir_kerning_work, create_kern_segment_work, create_kerns_work};
+pub use marks::create_mark_work;
+
 #[derive(Debug)]
 pub struct FeatureParsingWork {}
 
diff --git a/fontbe/src/kern.rs b/fontbe/src/features/kern.rs
similarity index 100%
rename from fontbe/src/kern.rs
rename to fontbe/src/features/kern.rs
diff --git a/fontbe/src/marks.rs b/fontbe/src/features/marks.rs
similarity index 100%
rename from fontbe/src/marks.rs
rename to fontbe/src/features/marks.rs
diff --git a/fontbe/src/lib.rs b/fontbe/src/lib.rs
index 21d2f9db4..faa65efd7 100644
--- a/fontbe/src/lib.rs
+++ b/fontbe/src/lib.rs
@@ -8,8 +8,6 @@ pub mod glyphs;
 pub mod gvar;
 pub mod head;
 pub mod hvar;
-pub mod kern;
-pub mod marks;
 pub mod metrics_and_limits;
 pub mod mvar;
 pub mod name;
diff --git a/fontc/src/lib.rs b/fontc/src/lib.rs
index 995172bcc..994574a95 100644
--- a/fontc/src/lib.rs
+++ b/fontc/src/lib.rs
@@ -24,15 +24,16 @@ use std::{
 use fontbe::{
     avar::create_avar_work,
     cmap::create_cmap_work,
-    features::{FeatureCompilationWork, FeatureParsingWork},
+    features::{
+        create_gather_ir_kerning_work, create_kerns_work, create_mark_work, FeatureCompilationWork,
+        FeatureParsingWork,
+    },
     font::create_font_work,
     fvar::create_fvar_work,
     glyphs::{create_glyf_loca_work, create_glyf_work},
     gvar::create_gvar_work,
     head::create_head_work,
     hvar::create_hvar_work,
-    kern::{create_gather_ir_kerning_work, create_kerns_work},
-    marks::create_mark_work,
     metrics_and_limits::create_metric_and_limit_work,
     mvar::create_mvar_work,
     name::create_name_work,
diff --git a/fontc/src/workload.rs b/fontc/src/workload.rs
index ec901c3d5..7696d97b7 100644
--- a/fontc/src/workload.rs
+++ b/fontc/src/workload.rs
@@ -11,7 +11,7 @@ use std::{
 
 use crossbeam_channel::{Receiver, TryRecvError};
 use fontbe::{
-    kern::create_kern_segment_work,
+    features::create_kern_segment_work,
     orchestration::{AnyWorkId, Context as BeContext, WorkId as BeWorkIdentifier},
 };
 use fontdrasil::{