diff --git a/Cargo.toml b/Cargo.toml
index 9cecf21..aa7ec58 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,6 @@
 
 members = [
     "satrs-core",
-    "satrs-macros",
     "satrs-mib",
     "satrs-example",
     "spacepackets",
diff --git a/satrs-mib/Cargo.toml b/satrs-mib/Cargo.toml
index b196f1c..975aed8 100644
--- a/satrs-mib/Cargo.toml
+++ b/satrs-mib/Cargo.toml
@@ -15,6 +15,9 @@ path = "../satrs-core"
 [dependencies.satrs-macros]
 path = "../satrs-macros"
 
+[dependencies.satrs-mib-codegen]
+path = "codegen"
+
 [dependencies.serde]
 version = "1.0"
 default-features = false
diff --git a/satrs-macros/Cargo.toml b/satrs-mib/codegen/Cargo.toml
similarity index 87%
rename from satrs-macros/Cargo.toml
rename to satrs-mib/codegen/Cargo.toml
index 9523869..7a1d882 100644
--- a/satrs-macros/Cargo.toml
+++ b/satrs-mib/codegen/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "satrs-macros"
+name = "satrs-mib-codegen"
 version = "0.1.0"
 edition = "2021"
 
@@ -16,13 +16,13 @@ quote = "1.0"
 proc-macro2 = "1.0"
 
 [dependencies.satrs-core]
-path = "../satrs-core"
+path = "../../satrs-core"
 
 [dev-dependencies]
 trybuild = { version = "1.0", features = ["diff"] }
 
 [dev-dependencies.satrs-mib]
-path = "../satrs-mib"
+path = ".."
 
 [dependencies.syn]
 version = "1.0"
diff --git a/satrs-macros/src/lib.rs b/satrs-mib/codegen/src/lib.rs
similarity index 100%
rename from satrs-macros/src/lib.rs
rename to satrs-mib/codegen/src/lib.rs
diff --git a/satrs-macros/tests/basic.rs b/satrs-mib/codegen/tests/basic.rs
similarity index 100%
rename from satrs-macros/tests/basic.rs
rename to satrs-mib/codegen/tests/basic.rs
diff --git a/satrs-macros/tests/tests.rs b/satrs-mib/codegen/tests/tests.rs
similarity index 100%
rename from satrs-macros/tests/tests.rs
rename to satrs-mib/codegen/tests/tests.rs
diff --git a/satrs-macros/tests/verify_gen_struct.rs b/satrs-mib/codegen/tests/verify_gen_struct.rs
similarity index 100%
rename from satrs-macros/tests/verify_gen_struct.rs
rename to satrs-mib/codegen/tests/verify_gen_struct.rs
diff --git a/satrs-mib/src/lib.rs b/satrs-mib/src/lib.rs
index 1563025..cd42767 100644
--- a/satrs-mib/src/lib.rs
+++ b/satrs-mib/src/lib.rs
@@ -1 +1,2 @@
+pub use satrs_mib_codegen::*;
 pub mod res_code;