diff --git a/asterixdb/asterix-doc/src/site/markdown/aql/filters.md b/asterixdb/asterix-doc/src/site/markdown/sqlpp/filters.md
similarity index 100%
rename from asterixdb/asterix-doc/src/site/markdown/aql/filters.md
rename to asterixdb/asterix-doc/src/site/markdown/sqlpp/filters.md
diff --git a/asterixdb/asterix-doc/src/site/markdown/aql/fulltext.md b/asterixdb/asterix-doc/src/site/markdown/sqlpp/fulltext.md
similarity index 100%
rename from asterixdb/asterix-doc/src/site/markdown/aql/fulltext.md
rename to asterixdb/asterix-doc/src/site/markdown/sqlpp/fulltext.md
diff --git a/asterixdb/asterix-doc/src/site/markdown/aql/similarity.md b/asterixdb/asterix-doc/src/site/markdown/sqlpp/similarity.md
similarity index 100%
rename from asterixdb/asterix-doc/src/site/markdown/aql/similarity.md
rename to asterixdb/asterix-doc/src/site/markdown/sqlpp/similarity.md
diff --git a/asterixdb/asterix-doc/src/site/site.xml b/asterixdb/asterix-doc/src/site/site.xml
index 99947ad..1167c37 100644
--- a/asterixdb/asterix-doc/src/site/site.xml
+++ b/asterixdb/asterix-doc/src/site/site.xml
@@ -71,36 +71,36 @@
     </menu>
 
     <menu name = "AsterixDB Primer">
-      <item name="Option 1: using SQL++" href="sqlpp/primer-sqlpp.html"/>
-      <item name="Option 2: using AQL" href="aql/primer.html"/>
+      <item name="Using SQL++" href="sqlpp/primer-sqlpp.html"/>
     </menu>
 
     <menu name="Data Model">
       <item name="The Asterix Data Model" href="datamodel.html"/>
     </menu>
 
-    <menu name="Queries - SQL++">
+    <menu name="Queries">
       <item name="The SQL++ Query Language" href="sqlpp/manual.html"/>
       <item name="Builtin Functions" href="sqlpp/builtins.html"/>
     </menu>
 
-    <menu name="Queries - AQL">
-      <item name="The Asterix Query Language (AQL)" href="aql/manual.html"/>
-      <item name="Builtin Functions" href="aql/builtins.html"/>
-    </menu>
-
     <menu name="API/SDK">
       <item name="HTTP API" href="api.html"/>
       <item name="CSV Output" href="csv.html"/>
     </menu>
 
     <menu name="Advanced Features">
-      <item name="Support of Full-text Queries" href="aql/fulltext.html"/>
       <item name="Accessing External Data" href="aql/externaldata.html"/>
       <item name="Support for Data Ingestion" href="feeds/tutorial.html"/>
       <item name="User Defined Functions" href="udf.html"/>
-      <item name="Filter-Based LSM Index Acceleration" href="aql/filters.html"/>
-      <item name="Support of Similarity Queries" href="aql/similarity.html"/>
+      <item name="Filter-Based LSM Index Acceleration" href="sqlpp/filters.html"/>
+      <item name="Support of Full-text Queries" href="sqlpp/fulltext.html"/>
+      <item name="Support of Similarity Queries" href="sqlpp/similarity.html"/>
+    </menu>
+
+    <menu name="Deprecated">
+      <item name="AsterixDB Primer: Using AQL" href="aql/primer.html"/>
+      <item name="Queries: The Asterix Query Language (AQL)" href="aql/manual.html"/>
+      <item name="Queries: Builtin Functions (AQL)" href="aql/builtins.html"/>
     </menu>
 
     <menu ref="reports"/>