diff --git a/poc-memory/src/lib.rs b/poc-memory/src/lib.rs
index 60e4cdf..6c35ce0 100644
--- a/poc-memory/src/lib.rs
+++ b/poc-memory/src/lib.rs
@@ -8,11 +8,14 @@ pub mod config;
 pub mod store;
 pub mod util;
 pub mod graph;
-pub mod search;
+pub mod query;
 pub mod similarity;
 pub mod spectral;
 pub mod lookups;
-pub mod query;
+// search was moved into query/engine
+pub use query::engine as search;
+// old query.rs moved into query/parser
+pub use query::parser as query_parser;
 pub mod transcript;
 pub mod neuro;
 pub mod counters;
diff --git a/poc-memory/src/search.rs b/poc-memory/src/query/engine.rs
similarity index 100%
rename from poc-memory/src/search.rs
rename to poc-memory/src/query/engine.rs
diff --git a/poc-memory/src/query/mod.rs b/poc-memory/src/query/mod.rs
new file mode 100644
index 0000000..af296b8
--- /dev/null
+++ b/poc-memory/src/query/mod.rs
@@ -0,0 +1,13 @@
+// query/ — query parsing, search algorithms, and pipeline execution
+//
+// parser.rs  — PEG-based query language (key ~ 'foo' | sort degree | limit 10)
+// engine.rs  — search algorithms: spreading activation, spectral, geodesic,
+//              manifold, confluence. Query DSL execution. Seed matching.
+
+pub mod parser;
+pub mod engine;
+
+// Re-export parser's run_query as the main query entry point
+// (engine::run_query is the internal search pipeline, accessed via crate::search)
+pub use parser::run_query;
+pub use parser::execute_query;
diff --git a/poc-memory/src/query.rs b/poc-memory/src/query/parser.rs
similarity index 100%
rename from poc-memory/src/query.rs
rename to poc-memory/src/query/parser.rs