diff --git a/golem-worker-service-base/src/api_definition.rs b/golem-worker-service-base/src/definition/api_definition.rs
similarity index 100%
rename from golem-worker-service-base/src/api_definition.rs
rename to golem-worker-service-base/src/definition/api_definition.rs
diff --git a/golem-worker-service-base/src/definition/mod.rs b/golem-worker-service-base/src/definition/mod.rs
new file mode 100644
index 000000000..7f8107ff9
--- /dev/null
+++ b/golem-worker-service-base/src/definition/mod.rs
@@ -0,0 +1 @@
+mod api_definition;
\ No newline at end of file
diff --git a/golem-worker-service-base/src/lib.rs b/golem-worker-service-base/src/lib.rs
index b021e6641..76a56c3f6 100644
--- a/golem-worker-service-base/src/lib.rs
+++ b/golem-worker-service-base/src/lib.rs
@@ -9,7 +9,7 @@ pub mod expression;
 pub mod getter;
 pub mod merge;
 pub mod metrics;
-pub mod oas_worker_bridge;
+pub mod definition;
 pub mod parser;
 pub mod path;
 pub mod primitive;
@@ -18,9 +18,7 @@ pub mod tokeniser;
 pub mod worker_request;
 pub mod worker_request_to_response;
 pub mod worker_response;
-
-pub mod api_definition;
-pub mod golem_worker_binding;
+pub mod worker_binding;
 pub trait UriBackConversion {
     fn as_http_02(&self) -> http_02::Uri;
 }
diff --git a/golem-worker-service-base/src/worker_binding/mod.rs b/golem-worker-service-base/src/worker_binding/mod.rs
index e69de29bb..5fff1a66e 100644
--- a/golem-worker-service-base/src/worker_binding/mod.rs
+++ b/golem-worker-service-base/src/worker_binding/mod.rs
@@ -0,0 +1,2 @@
+pub mod golem_worker_binding;
+pub mod worker_binding_resolver;
\ No newline at end of file
diff --git a/golem-worker-service-base/src/worker_binding/worker_binding_resolver.rs b/golem-worker-service-base/src/worker_binding/worker_binding_resolver.rs
index 4b01b9b9c..4fd9c531d 100644
--- a/golem-worker-service-base/src/worker_binding/worker_binding_resolver.rs
+++ b/golem-worker-service-base/src/worker_binding/worker_binding_resolver.rs
@@ -1,11 +1,5 @@
 use golem_wasm_rpc::TypeAnnotatedValue;
-use std::collections::HashMap;
-
-use hyper::http::Method;
-use crate::golem_worker_binding::GolemWorkerBinding;
-
-use crate::http_api_definition::{HttpApiDefinition, GolemWorkerBinding, MethodPattern};
-use crate::http_request::InputHttpRequest;
+use crate::worker_binding::golem_worker_binding::GolemWorkerBinding;
 
 // For any input request type, there should be a way to resolve the
 // worker binding template, which is then used to form the worker request
diff --git a/golem-worker-service-base/src/worker_request.rs b/golem-worker-service-base/src/worker_request.rs
index 9f18c8be4..f59b5f42a 100644
--- a/golem-worker-service-base/src/worker_request.rs
+++ b/golem-worker-service-base/src/worker_request.rs
@@ -2,9 +2,8 @@ use golem_common::model::TemplateId;
 use golem_wasm_rpc::json::get_json_from_typed_value;
 use golem_wasm_rpc::TypeAnnotatedValue;
 use serde_json::Value;
-
-use crate::worker_binding_resolver::ResolvedWorkerBinding;
 use crate::evaluator::{Evaluator, RawString};
+use crate::worker_binding::worker_binding_resolver::ResolvedWorkerBinding;
 
 // Every input request can be resolved to a worker request,
 // along with the value of any variables that's associated with it.
diff --git a/golem-worker-service-base/src/worker_response.rs b/golem-worker-service-base/src/worker_response.rs
index 482fe2eef..5e70ac493 100644
--- a/golem-worker-service-base/src/worker_response.rs
+++ b/golem-worker-service-base/src/worker_response.rs
@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 
 use crate::evaluator::{EvaluationError, Evaluator};
-use crate::expr::Expr;
 use crate::merge::Merge;
 use crate::primitive::{GetPrimitive, Primitive};
 use crate::tokeniser::tokenizer::Token;
@@ -10,13 +9,14 @@ use crate::worker_request_to_response::WorkerRequestToResponse;
 use async_trait::async_trait;
 use golem_service_base::type_inference::*;
 use golem_wasm_ast::analysis::AnalysedType;
+use golem_wasm_ast::core::Expr;
 use golem_wasm_rpc::json::{get_json_from_typed_value, get_typed_value_from_json};
 use golem_wasm_rpc::TypeAnnotatedValue;
 use http::{HeaderMap, StatusCode};
 use poem::{Body, ResponseParts};
 use serde_json::json;
 use tracing::info;
-use crate::golem_worker_binding::ResponseMapping;
+use crate::worker_binding::golem_worker_binding::ResponseMapping;
 
 pub struct WorkerResponse {
     pub result: TypeAnnotatedValue,