diff --git a/lib/policy/expressions/README.md b/lib/checker/expression/README.md
similarity index 100%
rename from lib/policy/expressions/README.md
rename to lib/checker/expression/README.md
diff --git a/lib/checker/expression/checker.go b/lib/checker/expression/checker.go
index 4c80513..0799973 100644
--- a/lib/checker/expression/checker.go
+++ b/lib/checker/expression/checker.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/TecharoHQ/anubis/internal"
 	"github.com/TecharoHQ/anubis/lib/checker/expression/environment"
-	"github.com/TecharoHQ/anubis/lib/policy/expressions"
 	"github.com/google/cel-go/cel"
 	"github.com/google/cel-go/common/types"
 )
@@ -72,15 +71,15 @@ func (cr *CELRequest) ResolveName(name string) (any, bool) {
 	case "path":
 		return cr.URL.Path, true
 	case "query":
-		return expressions.URLValues{Values: cr.URL.Query()}, true
+		return URLValues{Values: cr.URL.Query()}, true
 	case "headers":
-		return expressions.HTTPHeaders{Header: cr.Header}, true
+		return HTTPHeaders{Header: cr.Header}, true
 	case "load_1m":
-		return expressions.Load1(), true
+		return Load1(), true
 	case "load_5m":
-		return expressions.Load5(), true
+		return Load5(), true
 	case "load_15m":
-		return expressions.Load15(), true
+		return Load15(), true
 	default:
 		return nil, false
 	}
diff --git a/lib/policy/expressions/http_headers.go b/lib/checker/expression/http_headers.go
similarity index 98%
rename from lib/policy/expressions/http_headers.go
rename to lib/checker/expression/http_headers.go
index 57fcc84..4aba61c 100644
--- a/lib/policy/expressions/http_headers.go
+++ b/lib/checker/expression/http_headers.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 import (
 	"net/http"
diff --git a/lib/policy/expressions/http_headers_test.go b/lib/checker/expression/http_headers_test.go
similarity index 98%
rename from lib/policy/expressions/http_headers_test.go
rename to lib/checker/expression/http_headers_test.go
index bb5c761..ed1f12d 100644
--- a/lib/policy/expressions/http_headers_test.go
+++ b/lib/checker/expression/http_headers_test.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 import (
 	"net/http"
diff --git a/lib/policy/expressions/loadavg.go b/lib/checker/expression/loadavg.go
similarity index 98%
rename from lib/policy/expressions/loadavg.go
rename to lib/checker/expression/loadavg.go
index 72b0878..fbed9ef 100644
--- a/lib/policy/expressions/loadavg.go
+++ b/lib/checker/expression/loadavg.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 import (
 	"context"
diff --git a/lib/policy/expressions/url_values.go b/lib/checker/expression/url_values.go
similarity index 98%
rename from lib/policy/expressions/url_values.go
rename to lib/checker/expression/url_values.go
index a4c6351..6390da4 100644
--- a/lib/policy/expressions/url_values.go
+++ b/lib/checker/expression/url_values.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 import (
 	"errors"
diff --git a/lib/policy/expressions/url_values_test.go b/lib/checker/expression/url_values_test.go
similarity index 98%
rename from lib/policy/expressions/url_values_test.go
rename to lib/checker/expression/url_values_test.go
index 14c24b8..b02ffb2 100644
--- a/lib/policy/expressions/url_values_test.go
+++ b/lib/checker/expression/url_values_test.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 import (
 	"net/url"
diff --git a/lib/policy/thresholds.go b/lib/policy/thresholds.go
index 1f77f63..ff55088 100644
--- a/lib/policy/thresholds.go
+++ b/lib/policy/thresholds.go
@@ -1,8 +1,8 @@
 package policy
 
 import (
+	"github.com/TecharoHQ/anubis/lib/checker/expression/environment"
 	"github.com/TecharoHQ/anubis/lib/policy/config"
-	"github.com/TecharoHQ/anubis/lib/policy/expressions"
 	"github.com/google/cel-go/cel"
 )
 
@@ -16,12 +16,12 @@ func ParsedThresholdFromConfig(t config.Threshold) (*Threshold, error) {
 		Threshold: t,
 	}
 
-	env, err := expressions.ThresholdEnvironment()
+	env, err := environment.Threshold()
 	if err != nil {
 		return nil, err
 	}
 
-	program, err := expressions.Compile(env, t.Expression.String())
+	program, err := environment.Compile(env, t.Expression.String())
 	if err != nil {
 		return nil, err
 	}