diff --git a/lib/rivet/src/ast/Env.ri b/lib/rivet/src/ast/Env.ri
index 974fd3d1c..b43a77884 100644
--- a/lib/rivet/src/ast/Env.ri
+++ b/lib/rivet/src/ast/Env.ri
@@ -4,7 +4,7 @@
 
 import std/{ sys, fs.Path };
 
-import ../{ prefs, report, utils };
+import ../{ prefs, utils/{self, report} };
 
 #[boxed]
 pub struct Env {
diff --git a/lib/rivet/src/ast/comptime.ri b/lib/rivet/src/ast/comptime.ri
index 4ea5ad225..a4574a27d 100644
--- a/lib/rivet/src/ast/comptime.ri
+++ b/lib/rivet/src/ast/comptime.ri
@@ -4,7 +4,7 @@
 
 import std/sys;
 
-import ../{ token, report };
+import ../{ token, utils/report };
 
 pub struct ComptimeIf {
     mut branches: []mut ComptimeIfBranch;
diff --git a/lib/rivet/src/builder/mod.ri b/lib/rivet/src/builder/mod.ri
index 2223acaa7..c0d400897 100644
--- a/lib/rivet/src/builder/mod.ri
+++ b/lib/rivet/src/builder/mod.ri
@@ -7,7 +7,7 @@ import std/{
 };
 
 import ../{
-    ast, prefs, token, parser, report, checker, resolver, utils/{self, depgraph}
+    ast, prefs, token, parser, checker, resolver, utils/{self, depgraph, report}
 };
 
 pub struct Builder {
diff --git a/lib/rivet/src/checker/builtin_call.ri b/lib/rivet/src/checker/builtin_call.ri
index 9311fae9a..939979d08 100644
--- a/lib/rivet/src/checker/builtin_call.ri
+++ b/lib/rivet/src/checker/builtin_call.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report };
+import ../{ ast, utils/report };
 
 extend Checker {
     func check_builtin_call(^mut self, builtin_call: &mut ast.Expr.BuiltinCall) -> ^mut ast.Type {
diff --git a/lib/rivet/src/checker/call_expr.ri b/lib/rivet/src/checker/call_expr.ri
index 0ff449f2c..b7f5567df 100644
--- a/lib/rivet/src/checker/call_expr.ri
+++ b/lib/rivet/src/checker/call_expr.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report, utils/maps };
+import ../{ ast, utils/{maps, report} };
 
 extend Checker {
     func check_call(^mut self, call_expr: &mut ast.Expr.Call) -> ^mut ast.Type {
diff --git a/lib/rivet/src/checker/decls.ri b/lib/rivet/src/checker/decls.ri
index 6cc01276f..9770e982c 100644
--- a/lib/rivet/src/checker/decls.ri
+++ b/lib/rivet/src/checker/decls.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report };
+import ../{ ast, utils/report };
 
 extend Checker {
     func check_global_vars(^mut self, decls: []^mut ast.Decl) {
diff --git a/lib/rivet/src/checker/exprs.ri b/lib/rivet/src/checker/exprs.ri
index cb9e138e2..f43cfab56 100644
--- a/lib/rivet/src/checker/exprs.ri
+++ b/lib/rivet/src/checker/exprs.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report };
+import ../{ ast, utils/report };
 
 extend Checker {
     func check_expr(^mut self, expr: ^mut ast.Expr) -> ^mut ast.Type {
diff --git a/lib/rivet/src/checker/match_expr.ri b/lib/rivet/src/checker/match_expr.ri
index f979f984c..06810d36c 100644
--- a/lib/rivet/src/checker/match_expr.ri
+++ b/lib/rivet/src/checker/match_expr.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, utils, report, utils/maps };
+import ../{ ast, utils/{self, report, maps} };
 
 extend Checker {
     const MATCH_EXHAUSTIVE_CUTOFF_LIMIT := 12;
diff --git a/lib/rivet/src/checker/mod.ri b/lib/rivet/src/checker/mod.ri
index 4c29c69f3..e8e6a5573 100644
--- a/lib/rivet/src/checker/mod.ri
+++ b/lib/rivet/src/checker/mod.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, token, utils, report };
+import ../{ ast, token, utils/{self, report} };
 
 enum LoopControlLegalityTracker {
     None,
diff --git a/lib/rivet/src/checker/mutability.ri b/lib/rivet/src/checker/mutability.ri
index 60c1be8c4..291a96963 100644
--- a/lib/rivet/src/checker/mutability.ri
+++ b/lib/rivet/src/checker/mutability.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, token, report };
+import ../{ ast, token, utils/report };
 
 extend Checker {
     func check_expr_is_mut(^self, expr: ^mut ast.Expr, from_assign: bool := false) {
diff --git a/lib/rivet/src/checker/name_cases.ri b/lib/rivet/src/checker/name_cases.ri
index b3f5890e8..cc5bcd2a1 100644
--- a/lib/rivet/src/checker/name_cases.ri
+++ b/lib/rivet/src/checker/name_cases.ri
@@ -4,7 +4,7 @@
 
 import std/traits;
 
-import ../{ token, utils, report };
+import ../{ token, utils/{self, report} };
 
 extend Checker {
     enum NameCase as uint8 < traits.Stringable {
diff --git a/lib/rivet/src/checker/stmts.ri b/lib/rivet/src/checker/stmts.ri
index 13b5cfa2a..7c42b9c6c 100644
--- a/lib/rivet/src/checker/stmts.ri
+++ b/lib/rivet/src/checker/stmts.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, token, report };
+import ../{ ast, token, utils/report };
 
 extend Checker {
     func check_stmts(^mut self, stmts: []^mut ast.Stmt) {
diff --git a/lib/rivet/src/checker/trait_impl.ri b/lib/rivet/src/checker/trait_impl.ri
index b328f231d..980900a97 100644
--- a/lib/rivet/src/checker/trait_impl.ri
+++ b/lib/rivet/src/checker/trait_impl.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, token, report };
+import ../{ ast, token, utils/report };
 
 extend Checker {
     func check_trait_impl(
diff --git a/lib/rivet/src/checker/types.ri b/lib/rivet/src/checker/types.ri
index cf4f99b7a..12df0d1fa 100644
--- a/lib/rivet/src/checker/types.ri
+++ b/lib/rivet/src/checker/types.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, token, report };
+import ../{ ast, token, utils/report };
 
 #[boxed]
 struct IncompatibleTypesError < Throwable {
diff --git a/lib/rivet/src/parser/decls.ri b/lib/rivet/src/parser/decls.ri
index 163e348d0..5810c73be 100644
--- a/lib/rivet/src/parser/decls.ri
+++ b/lib/rivet/src/parser/decls.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report, token };
+import ../{ ast, utils/report, token };
 
 extend Parser {
     func parse_doc_comments(^mut self) -> []ast.Comment {
diff --git a/lib/rivet/src/parser/exprs.ri b/lib/rivet/src/parser/exprs.ri
index 7806c4fce..42619f13c 100644
--- a/lib/rivet/src/parser/exprs.ri
+++ b/lib/rivet/src/parser/exprs.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report, token };
+import ../{ ast, utils/report, token };
 
 extend Parser {
     #[inline]
diff --git a/lib/rivet/src/parser/import.ri b/lib/rivet/src/parser/import.ri
index 992d536db..043c9a81f 100644
--- a/lib/rivet/src/parser/import.ri
+++ b/lib/rivet/src/parser/import.ri
@@ -4,7 +4,7 @@
 
 import std/strings;
 
-import ../{ ast, report, token };
+import ../{ ast, utils/report, token };
 
 extend Parser {
     #[inline]
diff --git a/lib/rivet/src/parser/mod.ri b/lib/rivet/src/parser/mod.ri
index 2f2f80819..aae8b92bb 100644
--- a/lib/rivet/src/parser/mod.ri
+++ b/lib/rivet/src/parser/mod.ri
@@ -4,7 +4,7 @@
 
 import std/fs.Path;
 
-import ../{ ast, report, token, tokenizer };
+import ../{ ast, utils/report, token, tokenizer };
 
 #[boxed]
 pub struct Parser {
diff --git a/lib/rivet/src/parser/stmts.ri b/lib/rivet/src/parser/stmts.ri
index 514bf0460..4cfa9a13b 100644
--- a/lib/rivet/src/parser/stmts.ri
+++ b/lib/rivet/src/parser/stmts.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report };
+import ../{ ast, utils/report };
 
 extend Parser {
     func parse_stmt(^mut self) -> ^mut ast.Stmt {
diff --git a/lib/rivet/src/parser/types.ri b/lib/rivet/src/parser/types.ri
index 3b7c022bb..6bbb0b958 100644
--- a/lib/rivet/src/parser/types.ri
+++ b/lib/rivet/src/parser/types.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report };
+import ../{ ast, utils/report };
 
 extend Parser {
     func parse_type(^mut self) -> ^mut ast.Type {
diff --git a/lib/rivet/src/resolver/Register.ri b/lib/rivet/src/resolver/Register.ri
index 084ccc6b6..21209b66d 100644
--- a/lib/rivet/src/resolver/Register.ri
+++ b/lib/rivet/src/resolver/Register.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report, token };
+import ../{ ast, utils/report, token };
 
 #[boxed]
 pub struct Register {
diff --git a/lib/rivet/src/resolver/decls.ri b/lib/rivet/src/resolver/decls.ri
index 812aa83b6..a7faf10a7 100644
--- a/lib/rivet/src/resolver/decls.ri
+++ b/lib/rivet/src/resolver/decls.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report };
+import ../{ ast, utils/report };
 
 extend Resolver {
     func resolve_decls(^mut self, decls: []^mut ast.Decl) {
diff --git a/lib/rivet/src/resolver/exprs.ri b/lib/rivet/src/resolver/exprs.ri
index 053deed19..a37f43629 100644
--- a/lib/rivet/src/resolver/exprs.ri
+++ b/lib/rivet/src/resolver/exprs.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report, token };
+import ../{ ast, utils/report, token };
 
 extend Resolver {
     func resolve_expr(^mut self, expr: ^mut ast.Expr) {
diff --git a/lib/rivet/src/resolver/mod.ri b/lib/rivet/src/resolver/mod.ri
index 07f7f8c5a..b47f1dd32 100644
--- a/lib/rivet/src/resolver/mod.ri
+++ b/lib/rivet/src/resolver/mod.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report, token };
+import ../{ ast, utils/report, token };
 
 import std/fs.Path;
 
diff --git a/lib/rivet/src/resolver/stmts.ri b/lib/rivet/src/resolver/stmts.ri
index eaf9b6319..38ea9389d 100644
--- a/lib/rivet/src/resolver/stmts.ri
+++ b/lib/rivet/src/resolver/stmts.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report };
+import ../{ ast, utils/report };
 
 extend Resolver {
     func resolve_stmts(^mut self, stmts: []^mut ast.Stmt) {
diff --git a/lib/rivet/src/resolver/types.ri b/lib/rivet/src/resolver/types.ri
index dda654911..1801a7b08 100644
--- a/lib/rivet/src/resolver/types.ri
+++ b/lib/rivet/src/resolver/types.ri
@@ -2,7 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../{ ast, report };
+import ../{ ast, utils/report };
 
 extend Resolver {
     func resolve_type(^mut self, type: ^mut ast.Type) -> bool {
diff --git a/lib/rivet/src/tokenizer/mod.ri b/lib/rivet/src/tokenizer/mod.ri
index 8bee651a8..18dcd0550 100644
--- a/lib/rivet/src/tokenizer/mod.ri
+++ b/lib/rivet/src/tokenizer/mod.ri
@@ -4,7 +4,7 @@
 
 import std/{ process, strings };
 
-import ../{ ast, token, utils, report, utils.{LF, CR} };
+import ../{ ast, token, utils/{self, report}, utils.{LF, CR} };
 
 const NUM_SEP := b'_';
 
diff --git a/lib/rivet/src/report/mod.ri b/lib/rivet/src/utils/report/mod.ri
similarity index 99%
rename from lib/rivet/src/report/mod.ri
rename to lib/rivet/src/utils/report/mod.ri
index 82e7da12a..4c9cd6c10 100644
--- a/lib/rivet/src/report/mod.ri
+++ b/lib/rivet/src/utils/report/mod.ri
@@ -4,7 +4,7 @@
 
 import std/{ traits, strings, console };
 
-import ../{ prefs, token, utils };
+import ../../{ prefs, token, utils };
 
 pub var report_table := ^mut ReportTable();