diff --git a/.gitignore b/.gitignore
index ad4f1c8..97d57e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,8 +11,8 @@ lib/liboga.*
 
 benchmark/fixtures/big.xml
 
-profile/samples/*.txt
-profile/samples/*/*.txt
+profile/samples/xml/*.txt
+profile/samples/xml/*/*.txt
 *.so
 tmp
 
diff --git a/profile/lexer/big_xml.rb b/profile/lexer/big_xml.rb
deleted file mode 100644
index f528693..0000000
--- a/profile/lexer/big_xml.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require_relative '../profile_helper'
-
-xml = read_big_xml
-
-profile_memory('lexer/big_xml') do
-  Oga::XML::Lexer.new(xml).advance { }
-end
diff --git a/profile/lexer/big_xml_io.rb b/profile/lexer/big_xml_io.rb
deleted file mode 100644
index 2d75750..0000000
--- a/profile/lexer/big_xml_io.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_relative '../profile_helper'
-
-profile_memory('lexer/big_xml') do
-  Oga::XML::Lexer.new(big_xml_file).advance { }
-end
diff --git a/profile/parser/big_xml.rb b/profile/parser/big_xml.rb
deleted file mode 100644
index c2af762..0000000
--- a/profile/parser/big_xml.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require_relative '../profile_helper'
-
-xml = read_big_xml
-
-profile_memory('parser/big_xml') do
-  Oga::XML::Parser.new(xml).parse
-end
diff --git a/profile/pull_parser/big_xml.rb b/profile/pull_parser/big_xml.rb
deleted file mode 100644
index 7e6e4d5..0000000
--- a/profile/pull_parser/big_xml.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require_relative '../profile_helper'
-
-xml = read_big_xml
-
-profile_memory('pull_parser/big_xml') do
-  Oga::XML::PullParser.new(xml).parse { }
-end
-
diff --git a/profile/samples/lexer/.gitkeep b/profile/samples/xml/lexer/.gitkeep
similarity index 100%
rename from profile/samples/lexer/.gitkeep
rename to profile/samples/xml/lexer/.gitkeep
diff --git a/profile/samples/parser/.gitkeep b/profile/samples/xml/parser/.gitkeep
similarity index 100%
rename from profile/samples/parser/.gitkeep
rename to profile/samples/xml/parser/.gitkeep
diff --git a/profile/samples/pull_parser/.gitkeep b/profile/samples/xml/pull_parser/.gitkeep
similarity index 100%
rename from profile/samples/pull_parser/.gitkeep
rename to profile/samples/xml/pull_parser/.gitkeep
diff --git a/profile/xml/lexer/big_xml.rb b/profile/xml/lexer/big_xml.rb
new file mode 100644
index 0000000..f21657a
--- /dev/null
+++ b/profile/xml/lexer/big_xml.rb
@@ -0,0 +1,7 @@
+require_relative '../../profile_helper'
+
+xml = read_big_xml
+
+profile_memory('xml/lexer/big_xml') do
+  Oga::XML::Lexer.new(xml).advance { }
+end
diff --git a/profile/xml/lexer/big_xml_io.rb b/profile/xml/lexer/big_xml_io.rb
new file mode 100644
index 0000000..5ae7152
--- /dev/null
+++ b/profile/xml/lexer/big_xml_io.rb
@@ -0,0 +1,5 @@
+require_relative '../../profile_helper'
+
+profile_memory('xml/lexer/big_xml') do
+  Oga::XML::Lexer.new(big_xml_file).advance { }
+end
diff --git a/profile/xml/parser/big_xml.rb b/profile/xml/parser/big_xml.rb
new file mode 100644
index 0000000..ea34dfa
--- /dev/null
+++ b/profile/xml/parser/big_xml.rb
@@ -0,0 +1,7 @@
+require_relative '../../profile_helper'
+
+xml = read_big_xml
+
+profile_memory('xml/parser/big_xml') do
+  Oga::XML::Parser.new(xml).parse
+end
diff --git a/profile/xml/pull_parser/big_xml.rb b/profile/xml/pull_parser/big_xml.rb
new file mode 100644
index 0000000..1069795
--- /dev/null
+++ b/profile/xml/pull_parser/big_xml.rb
@@ -0,0 +1,8 @@
+require_relative '../../profile_helper'
+
+xml = read_big_xml
+
+profile_memory('xml/pull_parser/big_xml') do
+  Oga::XML::PullParser.new(xml).parse { }
+end
+