diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
index 032706c8f643f0cf2c2a5360d9ffe611ad58d8f5..8a16767daa0e59f1c60b4ff7a76a2b3248b6ca64 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
@@ -104,6 +104,8 @@ import com.oracle.truffle.r.nodes.builtin.fastr.FastRStackTraceNodeGen;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRStats.FastRProfAttr;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRStats.FastRProfFuncounts;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRStats.FastRProfTypecounts;
+import com.oracle.truffle.r.nodes.builtin.query.RNextResQueryBuiltin;
+import com.oracle.truffle.r.nodes.builtin.query.RTableBuiltin;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRStatsFactory;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRSyntaxTree;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRSyntaxTreeNodeGen;
@@ -119,10 +121,8 @@ import com.oracle.truffle.r.nodes.builtin.fastr.FastRTry;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRTryNodeGen;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastrDqrls;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastrDqrlsNodeGen;
-import com.oracle.truffle.r.nodes.query.RNextResQueryBuiltin;
-import com.oracle.truffle.r.nodes.query.RNextResQueryBuiltinNodeGen;
-import com.oracle.truffle.r.nodes.query.RTableBuiltin;
-import com.oracle.truffle.r.nodes.query.RTableBuiltinNodeGen;
+import com.oracle.truffle.r.nodes.builtin.query.RNextResQueryBuiltinNodeGen;
+import com.oracle.truffle.r.nodes.builtin.query.RTableBuiltinNodeGen;
 import com.oracle.truffle.r.nodes.unary.UnaryNotNode;
 import com.oracle.truffle.r.nodes.unary.UnaryNotNodeGen;
 import com.oracle.truffle.r.runtime.RVisibility;
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RNextResQueryBuiltin.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RNextResQueryBuiltin.java
similarity index 98%
rename from com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RNextResQueryBuiltin.java
rename to com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RNextResQueryBuiltin.java
index 71b311624b07e0dafb49d12649e5f779e8c5ef9b..848658b809b4df63e501842700ba38055f07200e 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RNextResQueryBuiltin.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RNextResQueryBuiltin.java
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.truffle.r.nodes.query;
+package com.oracle.truffle.r.nodes.builtin.query;
 
 import qir.ast.QIRNode;
 
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RTableBuiltin.java
similarity index 97%
rename from com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java
rename to com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RTableBuiltin.java
index b44284f35dd1308b970f890ebfbd6c377f376c39..8800644521f85083ada4d3ba1f6c26f4fccadfdb 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RTableBuiltin.java
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.truffle.r.nodes.query;
+package com.oracle.truffle.r.nodes.builtin.query;
 
 import static com.oracle.truffle.r.runtime.RVisibility.OFF;
 import static com.oracle.truffle.r.runtime.builtins.RBehavior.PURE;