diff --git a/ql/consistency-queries/VariablesConsistency.ql b/ql/consistency-queries/VariablesConsistency.ql
index c510fcc8c93..acbf5c8a05a 100644
--- a/ql/consistency-queries/VariablesConsistency.ql
+++ b/ql/consistency-queries/VariablesConsistency.ql
@@ -1,4 +1,4 @@
-import codeql_ruby.Variable
+import codeql_ruby.ast.Variable
 
 query predicate ambiguousVariable(VariableAccess access, Variable variable) {
   access.getVariable() = variable and
diff --git a/ql/src/codeql_ruby/AST.qll b/ql/src/codeql_ruby/AST.qll
index 89ccae6c3eb..0171cf2bfa2 100644
--- a/ql/src/codeql_ruby/AST.qll
+++ b/ql/src/codeql_ruby/AST.qll
@@ -1,6 +1,6 @@
 import codeql.Locations
-import codeql_ruby.Method
-import codeql_ruby.Parameter
+import codeql_ruby.ast.Method
+import codeql_ruby.ast.Parameter
 private import codeql_ruby.Generated
 
 /**
diff --git a/ql/src/codeql_ruby/Method.qll b/ql/src/codeql_ruby/ast/Method.qll
similarity index 100%
rename from ql/src/codeql_ruby/Method.qll
rename to ql/src/codeql_ruby/ast/Method.qll
diff --git a/ql/src/codeql_ruby/Parameter.qll b/ql/src/codeql_ruby/ast/Parameter.qll
similarity index 100%
rename from ql/src/codeql_ruby/Parameter.qll
rename to ql/src/codeql_ruby/ast/Parameter.qll
diff --git a/ql/src/codeql_ruby/Variable.qll b/ql/src/codeql_ruby/ast/Variable.qll
similarity index 99%
rename from ql/src/codeql_ruby/Variable.qll
rename to ql/src/codeql_ruby/ast/Variable.qll
index 186837aa133..50eb92532d8 100644
--- a/ql/src/codeql_ruby/Variable.qll
+++ b/ql/src/codeql_ruby/ast/Variable.qll
@@ -1,6 +1,6 @@
 /** Provides classes for modeling program variables. */
 
-private import Generated::Generated
+private import codeql_ruby.Generated::Generated
 private import codeql.Locations
 
 private AstNode parent(AstNode n) {
diff --git a/ql/test/library-tests/variables/parameter.ql b/ql/test/library-tests/variables/parameter.ql
index dc75c0cf846..254abfc2dae 100644
--- a/ql/test/library-tests/variables/parameter.ql
+++ b/ql/test/library-tests/variables/parameter.ql
@@ -1,4 +1,4 @@
-import codeql_ruby.Variable
+import codeql_ruby.ast.Variable
 
 query predicate parameter(Parameter p, Variable v) { p.getAnAccess().getVariable() = v }
 
diff --git a/ql/test/library-tests/variables/varaccess.ql b/ql/test/library-tests/variables/varaccess.ql
index e3fc8f9b11f..2c62bc563a3 100644
--- a/ql/test/library-tests/variables/varaccess.ql
+++ b/ql/test/library-tests/variables/varaccess.ql
@@ -1,4 +1,4 @@
-import codeql_ruby.Variable
+import codeql_ruby.ast.Variable
 
 query predicate variableAccess(VariableAccess access, Variable variable, VariableScope scope) {
   variable = access.getVariable() and
diff --git a/ql/test/library-tests/variables/variable.ql b/ql/test/library-tests/variables/variable.ql
index abb7292eeab..e63cb8ffeb1 100644
--- a/ql/test/library-tests/variables/variable.ql
+++ b/ql/test/library-tests/variables/variable.ql
@@ -1,4 +1,4 @@
-import codeql_ruby.Variable
+import codeql_ruby.ast.Variable
 
 query predicate variable(Variable v) { any() }
 
diff --git a/ql/test/library-tests/variables/varscopes.ql b/ql/test/library-tests/variables/varscopes.ql
index a7f64cfcdcf..e0272ce17af 100644
--- a/ql/test/library-tests/variables/varscopes.ql
+++ b/ql/test/library-tests/variables/varscopes.ql
@@ -1,3 +1,3 @@
-import codeql_ruby.Variable
+import codeql_ruby.ast.Variable
 
 select any(VariableScope x)