diff --git a/plane_mcp/tools/cycles.py b/plane_mcp/tools/cycles.py
index 28a98ed..63eb177 100644
--- a/plane_mcp/tools/cycles.py
+++ b/plane_mcp/tools/cycles.py
@@ -18,12 +18,11 @@
 from plane.models.query_params import WorkItemQueryParams
 from pydantic import Field
 
-from plane_mcp.pql_reference import PQL_FIELD_HINT, PQL_FULL_REFERENCE
+from plane_mcp.client import get_plane_client_context
+from plane_mcp.tools.pql_reference import PQL_FIELD_HINT, PQL_FULL_REFERENCE
 
 logger = get_logger(__name__)
 
-from plane_mcp.client import get_plane_client_context
-
 
 def register_cycle_tools(mcp: FastMCP) -> None:
     """Register all cycle-related tools with the MCP server."""
diff --git a/plane_mcp/tools/modules.py b/plane_mcp/tools/modules.py
index 247ea6d..d16e1d8 100644
--- a/plane_mcp/tools/modules.py
+++ b/plane_mcp/tools/modules.py
@@ -15,11 +15,10 @@
     UpdateModule,
 )
 from plane.models.query_params import WorkItemQueryParams
-from plane.models.work_items import WorkItem
 from pydantic import Field
 
 from plane_mcp.client import get_plane_client_context
-from plane_mcp.pql_reference import PQL_FIELD_HINT, PQL_FULL_REFERENCE
+from plane_mcp.tools.pql_reference import PQL_FIELD_HINT, PQL_FULL_REFERENCE
 
 logger = get_logger(__name__)
 
diff --git a/plane_mcp/tools/pql.py b/plane_mcp/tools/pql.py
index 7383f0f..bf41897 100644
--- a/plane_mcp/tools/pql.py
+++ b/plane_mcp/tools/pql.py
@@ -16,7 +16,7 @@
 
 from fastmcp import FastMCP
 
-from plane_mcp.pql_reference import PQL_FIELD_DESCRIPTION, PQL_FULL_REFERENCE
+from plane_mcp.tools.pql_reference import PQL_FIELD_DESCRIPTION, PQL_FULL_REFERENCE
 
 
 def register_pql_tools(mcp: FastMCP) -> None:
diff --git a/plane_mcp/pql_reference.py b/plane_mcp/tools/pql_reference.py
similarity index 99%
rename from plane_mcp/pql_reference.py
rename to plane_mcp/tools/pql_reference.py
index ef66c29..5adee80 100644
--- a/plane_mcp/pql_reference.py
+++ b/plane_mcp/tools/pql_reference.py
@@ -342,4 +342,4 @@
 cf["<decimal-prop-uuid>"] >= 5
 cf["<bool-prop-uuid>"] = true
 ```
-"""
\ No newline at end of file
+"""
diff --git a/plane_mcp/tools/work_items.py b/plane_mcp/tools/work_items.py
index 3e9311d..377d63f 100644
--- a/plane_mcp/tools/work_items.py
+++ b/plane_mcp/tools/work_items.py
@@ -18,7 +18,7 @@
 from pydantic import Field
 
 from plane_mcp.client import get_plane_client_context
-from plane_mcp.pql_reference import PQL_FIELD_HINT, PQL_FULL_REFERENCE
+from plane_mcp.tools.pql_reference import PQL_FIELD_HINT, PQL_FULL_REFERENCE
 
 logger = get_logger(__name__)