diff --git a/Cargo.toml b/Cargo.toml
index 0cfb5050ae..56716f25df 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ path = "./leo/package"
 version = "1.5.3"
 
 [dependencies.leo-span]
-path = "./leo/span"
+path = "./compiler/span"
 version = "1.5.3"
 
 [dependencies.aleo]
diff --git a/compiler/ast/Cargo.toml b/compiler/ast/Cargo.toml
index b6cc017397..030409b95e 100644
--- a/compiler/ast/Cargo.toml
+++ b/compiler/ast/Cargo.toml
@@ -23,7 +23,7 @@ path = "../../leo/errors"
 version = "1.5.3"
 
 [dependencies.leo-span]
-path = "../../leo/span"
+path = "../span"
 version = "1.5.3"
 
 [dependencies.indexmap]
diff --git a/compiler/compiler/Cargo.toml b/compiler/compiler/Cargo.toml
index a62027dddd..7f9fc52102 100644
--- a/compiler/compiler/Cargo.toml
+++ b/compiler/compiler/Cargo.toml
@@ -34,13 +34,13 @@ version = "1.5.3"
 path = "../parser"
 version = "1.5.3"
 
+[dependencies.leo-span]
+path = "../span"
+version = "1.5.3"
+
 [dependencies.sha2]
 version = "0.10"
 
-[dependencies.leo-span]
-path = "../../leo/span"
-version = "1.5.3"
-
 [dev-dependencies.leo-test-framework]
 path = "../../tests/test-framework"
 version = "1.4.0"
diff --git a/compiler/core/Cargo.toml b/compiler/core/Cargo.toml
index f45e42fbd5..de8cfbefdf 100644
--- a/compiler/core/Cargo.toml
+++ b/compiler/core/Cargo.toml
@@ -29,7 +29,7 @@ path = "../../leo/errors"
 version = "1.5.3"
 
 [dependencies.leo-span]
-path = "../../leo/span"
+path = "../span"
 version = "1.5.3"
 
 [dependencies.indexmap]
diff --git a/compiler/parser/Cargo.toml b/compiler/parser/Cargo.toml
index 5d55d72dcc..eca69db088 100644
--- a/compiler/parser/Cargo.toml
+++ b/compiler/parser/Cargo.toml
@@ -27,7 +27,7 @@ path = "../../leo/errors"
 version = "1.5.3"
 
 [dependencies.leo-span]
-path = "../../leo/span"
+path = "../span"
 version = "1.5.3"
 
 [dependencies.snarkvm-dpc]
diff --git a/compiler/passes/Cargo.toml b/compiler/passes/Cargo.toml
index b590a178cf..132f9d69f1 100644
--- a/compiler/passes/Cargo.toml
+++ b/compiler/passes/Cargo.toml
@@ -37,7 +37,7 @@ path = "../parser"
 version = "1.5.3"
 
 [dependencies.leo-span]
-path = "../../leo/span"
+path = "../span"
 version = "1.5.3"
 
 [dependencies.leo-core]
diff --git a/leo/span/Cargo.toml b/compiler/span/Cargo.toml
similarity index 100%
rename from leo/span/Cargo.toml
rename to compiler/span/Cargo.toml
diff --git a/leo/span/src/dropless.rs b/compiler/span/src/dropless.rs
similarity index 100%
rename from leo/span/src/dropless.rs
rename to compiler/span/src/dropless.rs
diff --git a/leo/span/src/lib.rs b/compiler/span/src/lib.rs
similarity index 100%
rename from leo/span/src/lib.rs
rename to compiler/span/src/lib.rs
diff --git a/leo/span/src/source_map.rs b/compiler/span/src/source_map.rs
similarity index 100%
rename from leo/span/src/source_map.rs
rename to compiler/span/src/source_map.rs
diff --git a/leo/span/src/span.rs b/compiler/span/src/span.rs
similarity index 100%
rename from leo/span/src/span.rs
rename to compiler/span/src/span.rs
diff --git a/leo/span/src/span_json.rs b/compiler/span/src/span_json.rs
similarity index 100%
rename from leo/span/src/span_json.rs
rename to compiler/span/src/span_json.rs
diff --git a/leo/span/src/symbol.rs b/compiler/span/src/symbol.rs
similarity index 100%
rename from leo/span/src/symbol.rs
rename to compiler/span/src/symbol.rs
diff --git a/leo/errors/Cargo.toml b/leo/errors/Cargo.toml
index 7cdabcc335..a5b7255309 100644
--- a/leo/errors/Cargo.toml
+++ b/leo/errors/Cargo.toml
@@ -19,7 +19,7 @@ edition = "2021"
 rust-version = "1.56"
 
 [dependencies.leo-span]
-path = "../span"
+path = "../../compiler/span"
 version = "1.5.3"
 
 [dependencies.anyhow]
diff --git a/tests/test-framework/Cargo.toml b/tests/test-framework/Cargo.toml
index fd6d3db676..8422c9d569 100644
--- a/tests/test-framework/Cargo.toml
+++ b/tests/test-framework/Cargo.toml
@@ -21,9 +21,16 @@ edition = "2018"
 name = "leo_compiler"
 harness = false
 
-[dependencies]
-backtrace = "0.3.66"
-walkdir = "2.3.2"
+[dependencies.leo-errors]
+path = "../../leo/errors"
+version = "1.5.3"
+
+[dependencies.backtrace]
+version = "0.3.66"
+
+[dependencies.clap]
+version = "3.1"
+features = ["derive"]
 
 [dependencies.serde]
 version = "1.0"
@@ -36,24 +43,19 @@ features = ["preserve_order"]
 [dependencies.serde_yaml]
 version = "0.8"
 
-[dependencies.clap]
-version = "3.1"
-features = ["derive"]
-
-[dependencies.leo-errors]
-path = "../../leo/errors"
-version = "1.5.3"
+[dependencies.walkdir]
+version = "2.3"
 
 [dependencies.regex]
 version = "1.6"
 
-[dev-dependencies.criterion]
-version = "0.3"
-
 [dev-dependencies.leo-compiler]
 path = "../../compiler/compiler"
 version = "1.5.3"
 
 [dev-dependencies.leo-span]
-path = "../../leo/span"
-version = "1.5.3"
\ No newline at end of file
+path = "../../compiler/span"
+version = "1.5.3"
+
+[dev-dependencies.criterion]
+version = "0.3"