diff --git a/spec/oga/lexer/cdata_spec.rb b/spec/oga/xml/lexer/cdata_spec.rb
similarity index 100%
rename from spec/oga/lexer/cdata_spec.rb
rename to spec/oga/xml/lexer/cdata_spec.rb
diff --git a/spec/oga/lexer/comments_spec.rb b/spec/oga/xml/lexer/comments_spec.rb
similarity index 100%
rename from spec/oga/lexer/comments_spec.rb
rename to spec/oga/xml/lexer/comments_spec.rb
diff --git a/spec/oga/lexer/doctype_spec.rb b/spec/oga/xml/lexer/doctype_spec.rb
similarity index 100%
rename from spec/oga/lexer/doctype_spec.rb
rename to spec/oga/xml/lexer/doctype_spec.rb
diff --git a/spec/oga/lexer/documents_spec.rb b/spec/oga/xml/lexer/documents_spec.rb
similarity index 100%
rename from spec/oga/lexer/documents_spec.rb
rename to spec/oga/xml/lexer/documents_spec.rb
diff --git a/spec/oga/lexer/elements_spec.rb b/spec/oga/xml/lexer/elements_spec.rb
similarity index 100%
rename from spec/oga/lexer/elements_spec.rb
rename to spec/oga/xml/lexer/elements_spec.rb
diff --git a/spec/oga/lexer/general_spec.rb b/spec/oga/xml/lexer/general_spec.rb
similarity index 100%
rename from spec/oga/lexer/general_spec.rb
rename to spec/oga/xml/lexer/general_spec.rb
diff --git a/spec/oga/lexer/html_void_elements_spec.rb b/spec/oga/xml/lexer/html_void_elements_spec.rb
similarity index 100%
rename from spec/oga/lexer/html_void_elements_spec.rb
rename to spec/oga/xml/lexer/html_void_elements_spec.rb
diff --git a/spec/oga/lexer/xml_declaration_spec.rb b/spec/oga/xml/lexer/xml_declaration_spec.rb
similarity index 100%
rename from spec/oga/lexer/xml_declaration_spec.rb
rename to spec/oga/xml/lexer/xml_declaration_spec.rb
diff --git a/spec/oga/parser/cdata_spec.rb b/spec/oga/xml/parser/cdata_spec.rb
similarity index 100%
rename from spec/oga/parser/cdata_spec.rb
rename to spec/oga/xml/parser/cdata_spec.rb
diff --git a/spec/oga/parser/comments_spec.rb b/spec/oga/xml/parser/comments_spec.rb
similarity index 100%
rename from spec/oga/parser/comments_spec.rb
rename to spec/oga/xml/parser/comments_spec.rb
diff --git a/spec/oga/parser/doctype_spec.rb b/spec/oga/xml/parser/doctype_spec.rb
similarity index 100%
rename from spec/oga/parser/doctype_spec.rb
rename to spec/oga/xml/parser/doctype_spec.rb
diff --git a/spec/oga/parser/documents_spec.rb b/spec/oga/xml/parser/documents_spec.rb
similarity index 100%
rename from spec/oga/parser/documents_spec.rb
rename to spec/oga/xml/parser/documents_spec.rb
diff --git a/spec/oga/parser/elements_spec.rb b/spec/oga/xml/parser/elements_spec.rb
similarity index 100%
rename from spec/oga/parser/elements_spec.rb
rename to spec/oga/xml/parser/elements_spec.rb
diff --git a/spec/oga/parser/general_spec.rb b/spec/oga/xml/parser/general_spec.rb
similarity index 100%
rename from spec/oga/parser/general_spec.rb
rename to spec/oga/xml/parser/general_spec.rb
diff --git a/spec/oga/parser/html_void_elements_spec.rb b/spec/oga/xml/parser/html_void_elements_spec.rb
similarity index 100%
rename from spec/oga/parser/html_void_elements_spec.rb
rename to spec/oga/xml/parser/html_void_elements_spec.rb
diff --git a/spec/oga/parser/xml_declaration_spec.rb b/spec/oga/xml/parser/xml_declaration_spec.rb
similarity index 100%
rename from spec/oga/parser/xml_declaration_spec.rb
rename to spec/oga/xml/parser/xml_declaration_spec.rb