diff --git a/nac3artiq/src/lib.rs b/nac3artiq/src/lib.rs
index 7e3fddb4..a3b3eb1a 100644
--- a/nac3artiq/src/lib.rs
+++ b/nac3artiq/src/lib.rs
@@ -65,13 +65,9 @@ use nac3core::{
 };
 use nac3ld::Linker;
 
-use crate::{
-    codegen::{
-        attributes_writeback, gen_core_log, gen_rtio_log, rpc_codegen_callback, ArtiqCodeGenerator,
-    },
-    symbol_resolver::{DeferredEvaluationStore, InnerResolver, PythonHelper, Resolver},
-    timeline::TimeFns,
-};
+use codegen::{attributes_writeback, gen_core_log, gen_rtio_log, rpc_codegen_callback, ArtiqCodeGenerator};
+use symbol_resolver::{DeferredEvaluationStore, InnerResolver, PythonHelper, Resolver};
+use timeline::TimeFns;
 
 mod codegen;
 mod symbol_resolver;
diff --git a/nac3core/src/codegen/mod.rs b/nac3core/src/codegen/mod.rs
index 02aa8ad1..7e99c585 100644
--- a/nac3core/src/codegen/mod.rs
+++ b/nac3core/src/codegen/mod.rs
@@ -29,7 +29,6 @@ use parking_lot::{Condvar, Mutex};
 use nac3parser::ast::{Location, Stmt, StrRef};
 
 use crate::{
-    codegen::classes::{ListType, NDArrayType, ProxyType, RangeType},
     symbol_resolver::{StaticValue, SymbolResolver},
     toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys, TopLevelContext, TopLevelDef},
     typecheck::{
@@ -37,6 +36,7 @@ use crate::{
         typedef::{CallId, FuncArg, Type, TypeEnum, Unifier},
     },
 };
+use classes::{ListType, NDArrayType, ProxyType, RangeType};
 use concrete_type::{ConcreteType, ConcreteTypeEnum, ConcreteTypeStore};
 pub use generator::{CodeGenerator, DefaultCodeGenerator};