diff --git a/Rakefile b/Rakefile
index b86ab8b..6180f3d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,12 +10,14 @@ task :default => [:spec]
 namespace :specs do
   task :update do
     sources = [
-      { urls: ["http://microformats.org/wiki/microformats-2"],
+      { dir: "microformats.org",
+        urls: ["http://microformats.org/wiki/microformats-2"],
         html_selector: ".source-html4strict",
         json_selector: ".source-javascript",
         html_method: "inner_text"
       },
-      { urls: [
+      { dir: "microformat2-node.jit.su",
+        urls: [
           "http://microformat2-node.jit.su/h-adr.html",
           "http://microformat2-node.jit.su/h-card.html",
           "http://microformat2-node.jit.su/h-entry.html",
@@ -43,17 +45,19 @@ namespace :specs do
         html = document.css(source[:html_selector]).map { |e| e.send(source[:html_method]) }
         json = document.css(source[:json_selector]).map { |e| e.inner_text }
 
-        filename = url.split("/").last.gsub(/[.]\w+/, "")
-        filepath = "spec/support/cases/"
+        name = url.split("/").last.gsub(/[.]\w+/, "")
+        path = File.join "spec/support/cases", source[:dir], name
+
+        FileUtils.mkdir_p(path)
 
         ([html.length, json.length].min).times do |index|
 
-          File.open("#{filepath}#{filename}-#{index}.html", "w") do |f|
+          File.open(File.join(path, "#{name}-#{index}.html"), "w") do |f|
             f.write "<!-- #{url} -->\n"
             f.write html[index]
           end
 
-          File.open("#{filepath}#{filename}-#{index}.js", "w") do |f|
+          File.open(File.join(path, "#{name}-#{index}.js"), "w") do |f|
             f.write "// #{url}\n"
             f.write json[index]
           end
diff --git a/lib/microformats2.rb b/lib/microformats2.rb
index 4f34caa..c0afa50 100644
--- a/lib/microformats2.rb
+++ b/lib/microformats2.rb
@@ -17,7 +17,7 @@ module Microformats2
 
     def read_html(html)
       open(html).read
-    rescue Errno::ENOENT => e
+    rescue Errno::ENOENT, Errno::ENAMETOOLONG => e
       html
     end
   end # class << self
diff --git a/lib/microformats2/property.rb b/lib/microformats2/property.rb
index 62821c0..ee2208e 100644
--- a/lib/microformats2/property.rb
+++ b/lib/microformats2/property.rb
@@ -32,15 +32,15 @@ module Microformats2
 
     class Url < Property::Parser
       def parse_flat_element(element)
-        (element.attribute("href") || property.text).to_s
+        (element.attribute("href") || element.attribute("src") || element.text).to_s
       end
     end
 
     class DateTime < Property::Parser
       def parse_flat_element(element)
-        ::DateTime.parse(element.attribute("datetime") || property.text)
+        ::DateTime.parse(element.attribute("datetime") || element.text)
       rescue ArgumentError => e
-        element.attribute("datetime") || property.text
+        (element.attribute("datetime") || element.text).to_s
       end
       def hash_safe_value
         @value.to_s
@@ -49,7 +49,7 @@ module Microformats2
 
     class Embedded < Property::Parser
       def parse_flat_element(element)
-        element.text.gsub(/\n+/, " ").gsub(/\s+/, " ").strip
+        element.inner_html.strip
       end
     end
 
diff --git a/spec/lib/microformats2_spec.rb b/spec/lib/microformats2_spec.rb
index 1e85b3d..7b4ad44 100644
--- a/spec/lib/microformats2_spec.rb
+++ b/spec/lib/microformats2_spec.rb
@@ -29,7 +29,7 @@ describe Microformats2 do
   end
 
   describe "programatic case" do
-    cases_dir = "spec/support/cases"
+    cases_dir = "spec/support/cases/microformats.org/microformats-2"
     html_files = Dir.entries(cases_dir).keep_if { |f| f =~ /([.]html$)/ }
 
     html_files.each do |html_file|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c1478ed..23dfd5e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,6 +6,6 @@ require 'rspec'
 require 'rspec/autorun'
 
 RSpec.configure do |config|
-  config.order = "random"
+  # config.order = "random"
   config.color = true
 end
diff --git a/spec/support/cases/h-adr-0.html b/spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-0.html
similarity index 100%
rename from spec/support/cases/h-adr-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-0.html
diff --git a/spec/support/cases/h-adr-0.js b/spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-0.js
similarity index 100%
rename from spec/support/cases/h-adr-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-0.js
diff --git a/spec/support/cases/h-adr-1.html b/spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-1.html
similarity index 100%
rename from spec/support/cases/h-adr-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-1.html
diff --git a/spec/support/cases/h-adr-1.js b/spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-1.js
similarity index 100%
rename from spec/support/cases/h-adr-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-1.js
diff --git a/spec/support/cases/h-adr-2.html b/spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-2.html
similarity index 100%
rename from spec/support/cases/h-adr-2.html
rename to spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-2.html
diff --git a/spec/support/cases/h-adr-2.js b/spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-2.js
similarity index 100%
rename from spec/support/cases/h-adr-2.js
rename to spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-2.js
diff --git a/spec/support/cases/h-adr-3.html b/spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-3.html
similarity index 100%
rename from spec/support/cases/h-adr-3.html
rename to spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-3.html
diff --git a/spec/support/cases/h-adr-3.js b/spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-3.js
similarity index 100%
rename from spec/support/cases/h-adr-3.js
rename to spec/support/cases/microformat2-node.jit.su/h-adr/h-adr-3.js
diff --git a/spec/support/cases/h-card-0.html b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-0.html
similarity index 100%
rename from spec/support/cases/h-card-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-0.html
diff --git a/spec/support/cases/h-card-0.js b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-0.js
similarity index 100%
rename from spec/support/cases/h-card-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-0.js
diff --git a/spec/support/cases/h-card-1.html b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-1.html
similarity index 100%
rename from spec/support/cases/h-card-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-1.html
diff --git a/spec/support/cases/h-card-1.js b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-1.js
similarity index 100%
rename from spec/support/cases/h-card-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-1.js
diff --git a/spec/support/cases/h-card-2.html b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-2.html
similarity index 100%
rename from spec/support/cases/h-card-2.html
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-2.html
diff --git a/spec/support/cases/h-card-2.js b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-2.js
similarity index 100%
rename from spec/support/cases/h-card-2.js
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-2.js
diff --git a/spec/support/cases/h-card-3.html b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-3.html
similarity index 100%
rename from spec/support/cases/h-card-3.html
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-3.html
diff --git a/spec/support/cases/h-card-3.js b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-3.js
similarity index 100%
rename from spec/support/cases/h-card-3.js
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-3.js
diff --git a/spec/support/cases/h-card-4.html b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-4.html
similarity index 100%
rename from spec/support/cases/h-card-4.html
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-4.html
diff --git a/spec/support/cases/h-card-4.js b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-4.js
similarity index 100%
rename from spec/support/cases/h-card-4.js
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-4.js
diff --git a/spec/support/cases/h-card-5.html b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-5.html
similarity index 100%
rename from spec/support/cases/h-card-5.html
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-5.html
diff --git a/spec/support/cases/h-card-5.js b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-5.js
similarity index 100%
rename from spec/support/cases/h-card-5.js
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-5.js
diff --git a/spec/support/cases/h-card-6.html b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-6.html
similarity index 100%
rename from spec/support/cases/h-card-6.html
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-6.html
diff --git a/spec/support/cases/h-card-6.js b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-6.js
similarity index 100%
rename from spec/support/cases/h-card-6.js
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-6.js
diff --git a/spec/support/cases/h-card-7.html b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-7.html
similarity index 100%
rename from spec/support/cases/h-card-7.html
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-7.html
diff --git a/spec/support/cases/h-card-7.js b/spec/support/cases/microformat2-node.jit.su/h-card/h-card-7.js
similarity index 100%
rename from spec/support/cases/h-card-7.js
rename to spec/support/cases/microformat2-node.jit.su/h-card/h-card-7.js
diff --git a/spec/support/cases/h-entry-0.html b/spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-0.html
similarity index 100%
rename from spec/support/cases/h-entry-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-0.html
diff --git a/spec/support/cases/h-entry-0.js b/spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-0.js
similarity index 100%
rename from spec/support/cases/h-entry-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-0.js
diff --git a/spec/support/cases/h-entry-1.html b/spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-1.html
similarity index 100%
rename from spec/support/cases/h-entry-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-1.html
diff --git a/spec/support/cases/h-entry-1.js b/spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-1.js
similarity index 100%
rename from spec/support/cases/h-entry-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-1.js
diff --git a/spec/support/cases/h-entry-2.html b/spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-2.html
similarity index 100%
rename from spec/support/cases/h-entry-2.html
rename to spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-2.html
diff --git a/spec/support/cases/h-entry-2.js b/spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-2.js
similarity index 100%
rename from spec/support/cases/h-entry-2.js
rename to spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-2.js
diff --git a/spec/support/cases/h-entry-3.html b/spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-3.html
similarity index 100%
rename from spec/support/cases/h-entry-3.html
rename to spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-3.html
diff --git a/spec/support/cases/h-entry-3.js b/spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-3.js
similarity index 100%
rename from spec/support/cases/h-entry-3.js
rename to spec/support/cases/microformat2-node.jit.su/h-entry/h-entry-3.js
diff --git a/spec/support/cases/h-event-0.html b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-0.html
similarity index 100%
rename from spec/support/cases/h-event-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-0.html
diff --git a/spec/support/cases/h-event-0.js b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-0.js
similarity index 100%
rename from spec/support/cases/h-event-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-0.js
diff --git a/spec/support/cases/h-event-1.html b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-1.html
similarity index 100%
rename from spec/support/cases/h-event-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-1.html
diff --git a/spec/support/cases/h-event-1.js b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-1.js
similarity index 100%
rename from spec/support/cases/h-event-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-1.js
diff --git a/spec/support/cases/h-event-2.html b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-2.html
similarity index 100%
rename from spec/support/cases/h-event-2.html
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-2.html
diff --git a/spec/support/cases/h-event-2.js b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-2.js
similarity index 100%
rename from spec/support/cases/h-event-2.js
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-2.js
diff --git a/spec/support/cases/h-event-3.html b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-3.html
similarity index 100%
rename from spec/support/cases/h-event-3.html
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-3.html
diff --git a/spec/support/cases/h-event-3.js b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-3.js
similarity index 100%
rename from spec/support/cases/h-event-3.js
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-3.js
diff --git a/spec/support/cases/h-event-4.html b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-4.html
similarity index 100%
rename from spec/support/cases/h-event-4.html
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-4.html
diff --git a/spec/support/cases/h-event-4.js b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-4.js
similarity index 100%
rename from spec/support/cases/h-event-4.js
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-4.js
diff --git a/spec/support/cases/h-event-5.html b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-5.html
similarity index 100%
rename from spec/support/cases/h-event-5.html
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-5.html
diff --git a/spec/support/cases/h-event-5.js b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-5.js
similarity index 100%
rename from spec/support/cases/h-event-5.js
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-5.js
diff --git a/spec/support/cases/h-event-6.html b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-6.html
similarity index 100%
rename from spec/support/cases/h-event-6.html
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-6.html
diff --git a/spec/support/cases/h-event-6.js b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-6.js
similarity index 100%
rename from spec/support/cases/h-event-6.js
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-6.js
diff --git a/spec/support/cases/h-event-7.html b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-7.html
similarity index 100%
rename from spec/support/cases/h-event-7.html
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-7.html
diff --git a/spec/support/cases/h-event-7.js b/spec/support/cases/microformat2-node.jit.su/h-event/h-event-7.js
similarity index 100%
rename from spec/support/cases/h-event-7.js
rename to spec/support/cases/microformat2-node.jit.su/h-event/h-event-7.js
diff --git a/spec/support/cases/h-geo-0.html b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-0.html
similarity index 100%
rename from spec/support/cases/h-geo-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-0.html
diff --git a/spec/support/cases/h-geo-0.js b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-0.js
similarity index 100%
rename from spec/support/cases/h-geo-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-0.js
diff --git a/spec/support/cases/h-geo-1.html b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-1.html
similarity index 100%
rename from spec/support/cases/h-geo-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-1.html
diff --git a/spec/support/cases/h-geo-1.js b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-1.js
similarity index 100%
rename from spec/support/cases/h-geo-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-1.js
diff --git a/spec/support/cases/h-geo-2.html b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-2.html
similarity index 100%
rename from spec/support/cases/h-geo-2.html
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-2.html
diff --git a/spec/support/cases/h-geo-2.js b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-2.js
similarity index 100%
rename from spec/support/cases/h-geo-2.js
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-2.js
diff --git a/spec/support/cases/h-geo-3.html b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-3.html
similarity index 100%
rename from spec/support/cases/h-geo-3.html
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-3.html
diff --git a/spec/support/cases/h-geo-3.js b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-3.js
similarity index 100%
rename from spec/support/cases/h-geo-3.js
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-3.js
diff --git a/spec/support/cases/h-geo-4.html b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-4.html
similarity index 100%
rename from spec/support/cases/h-geo-4.html
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-4.html
diff --git a/spec/support/cases/h-geo-4.js b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-4.js
similarity index 100%
rename from spec/support/cases/h-geo-4.js
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-4.js
diff --git a/spec/support/cases/h-geo-5.html b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-5.html
similarity index 100%
rename from spec/support/cases/h-geo-5.html
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-5.html
diff --git a/spec/support/cases/h-geo-5.js b/spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-5.js
similarity index 100%
rename from spec/support/cases/h-geo-5.js
rename to spec/support/cases/microformat2-node.jit.su/h-geo/h-geo-5.js
diff --git a/spec/support/cases/h-news-0.html b/spec/support/cases/microformat2-node.jit.su/h-news/h-news-0.html
similarity index 100%
rename from spec/support/cases/h-news-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-news/h-news-0.html
diff --git a/spec/support/cases/h-news-0.js b/spec/support/cases/microformat2-node.jit.su/h-news/h-news-0.js
similarity index 100%
rename from spec/support/cases/h-news-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-news/h-news-0.js
diff --git a/spec/support/cases/h-news-1.html b/spec/support/cases/microformat2-node.jit.su/h-news/h-news-1.html
similarity index 100%
rename from spec/support/cases/h-news-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-news/h-news-1.html
diff --git a/spec/support/cases/h-news-1.js b/spec/support/cases/microformat2-node.jit.su/h-news/h-news-1.js
similarity index 100%
rename from spec/support/cases/h-news-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-news/h-news-1.js
diff --git a/spec/support/cases/h-org-0.html b/spec/support/cases/microformat2-node.jit.su/h-org/h-org-0.html
similarity index 100%
rename from spec/support/cases/h-org-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-org/h-org-0.html
diff --git a/spec/support/cases/h-org-0.js b/spec/support/cases/microformat2-node.jit.su/h-org/h-org-0.js
similarity index 100%
rename from spec/support/cases/h-org-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-org/h-org-0.js
diff --git a/spec/support/cases/h-org-1.html b/spec/support/cases/microformat2-node.jit.su/h-org/h-org-1.html
similarity index 100%
rename from spec/support/cases/h-org-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-org/h-org-1.html
diff --git a/spec/support/cases/h-org-1.js b/spec/support/cases/microformat2-node.jit.su/h-org/h-org-1.js
similarity index 100%
rename from spec/support/cases/h-org-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-org/h-org-1.js
diff --git a/spec/support/cases/h-org-2.html b/spec/support/cases/microformat2-node.jit.su/h-org/h-org-2.html
similarity index 100%
rename from spec/support/cases/h-org-2.html
rename to spec/support/cases/microformat2-node.jit.su/h-org/h-org-2.html
diff --git a/spec/support/cases/h-org-2.js b/spec/support/cases/microformat2-node.jit.su/h-org/h-org-2.js
similarity index 100%
rename from spec/support/cases/h-org-2.js
rename to spec/support/cases/microformat2-node.jit.su/h-org/h-org-2.js
diff --git a/spec/support/cases/h-product-0.html b/spec/support/cases/microformat2-node.jit.su/h-product/h-product-0.html
similarity index 100%
rename from spec/support/cases/h-product-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-product/h-product-0.html
diff --git a/spec/support/cases/h-product-0.js b/spec/support/cases/microformat2-node.jit.su/h-product/h-product-0.js
similarity index 100%
rename from spec/support/cases/h-product-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-product/h-product-0.js
diff --git a/spec/support/cases/h-product-1.html b/spec/support/cases/microformat2-node.jit.su/h-product/h-product-1.html
similarity index 100%
rename from spec/support/cases/h-product-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-product/h-product-1.html
diff --git a/spec/support/cases/h-product-1.js b/spec/support/cases/microformat2-node.jit.su/h-product/h-product-1.js
similarity index 100%
rename from spec/support/cases/h-product-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-product/h-product-1.js
diff --git a/spec/support/cases/h-product-2.html b/spec/support/cases/microformat2-node.jit.su/h-product/h-product-2.html
similarity index 100%
rename from spec/support/cases/h-product-2.html
rename to spec/support/cases/microformat2-node.jit.su/h-product/h-product-2.html
diff --git a/spec/support/cases/h-product-2.js b/spec/support/cases/microformat2-node.jit.su/h-product/h-product-2.js
similarity index 100%
rename from spec/support/cases/h-product-2.js
rename to spec/support/cases/microformat2-node.jit.su/h-product/h-product-2.js
diff --git a/spec/support/cases/h-product-3.html b/spec/support/cases/microformat2-node.jit.su/h-product/h-product-3.html
similarity index 100%
rename from spec/support/cases/h-product-3.html
rename to spec/support/cases/microformat2-node.jit.su/h-product/h-product-3.html
diff --git a/spec/support/cases/h-product-3.js b/spec/support/cases/microformat2-node.jit.su/h-product/h-product-3.js
similarity index 100%
rename from spec/support/cases/h-product-3.js
rename to spec/support/cases/microformat2-node.jit.su/h-product/h-product-3.js
diff --git a/spec/support/cases/h-recipe-0.html b/spec/support/cases/microformat2-node.jit.su/h-recipe/h-recipe-0.html
similarity index 100%
rename from spec/support/cases/h-recipe-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-recipe/h-recipe-0.html
diff --git a/spec/support/cases/h-recipe-0.js b/spec/support/cases/microformat2-node.jit.su/h-recipe/h-recipe-0.js
similarity index 100%
rename from spec/support/cases/h-recipe-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-recipe/h-recipe-0.js
diff --git a/spec/support/cases/h-recipe-1.html b/spec/support/cases/microformat2-node.jit.su/h-recipe/h-recipe-1.html
similarity index 100%
rename from spec/support/cases/h-recipe-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-recipe/h-recipe-1.html
diff --git a/spec/support/cases/h-recipe-1.js b/spec/support/cases/microformat2-node.jit.su/h-recipe/h-recipe-1.js
similarity index 100%
rename from spec/support/cases/h-recipe-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-recipe/h-recipe-1.js
diff --git a/spec/support/cases/h-resume-0.html b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-0.html
similarity index 100%
rename from spec/support/cases/h-resume-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-0.html
diff --git a/spec/support/cases/h-resume-0.js b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-0.js
similarity index 100%
rename from spec/support/cases/h-resume-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-0.js
diff --git a/spec/support/cases/h-resume-1.html b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-1.html
similarity index 100%
rename from spec/support/cases/h-resume-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-1.html
diff --git a/spec/support/cases/h-resume-1.js b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-1.js
similarity index 100%
rename from spec/support/cases/h-resume-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-1.js
diff --git a/spec/support/cases/h-resume-2.html b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-2.html
similarity index 100%
rename from spec/support/cases/h-resume-2.html
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-2.html
diff --git a/spec/support/cases/h-resume-2.js b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-2.js
similarity index 100%
rename from spec/support/cases/h-resume-2.js
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-2.js
diff --git a/spec/support/cases/h-resume-3.html b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-3.html
similarity index 100%
rename from spec/support/cases/h-resume-3.html
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-3.html
diff --git a/spec/support/cases/h-resume-3.js b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-3.js
similarity index 100%
rename from spec/support/cases/h-resume-3.js
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-3.js
diff --git a/spec/support/cases/h-resume-4.html b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-4.html
similarity index 100%
rename from spec/support/cases/h-resume-4.html
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-4.html
diff --git a/spec/support/cases/h-resume-4.js b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-4.js
similarity index 100%
rename from spec/support/cases/h-resume-4.js
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-4.js
diff --git a/spec/support/cases/h-resume-5.html b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-5.html
similarity index 100%
rename from spec/support/cases/h-resume-5.html
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-5.html
diff --git a/spec/support/cases/h-resume-5.js b/spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-5.js
similarity index 100%
rename from spec/support/cases/h-resume-5.js
rename to spec/support/cases/microformat2-node.jit.su/h-resume/h-resume-5.js
diff --git a/spec/support/cases/h-review-aggregate-0.html b/spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-0.html
similarity index 100%
rename from spec/support/cases/h-review-aggregate-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-0.html
diff --git a/spec/support/cases/h-review-aggregate-0.js b/spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-0.js
similarity index 100%
rename from spec/support/cases/h-review-aggregate-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-0.js
diff --git a/spec/support/cases/h-review-aggregate-1.html b/spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-1.html
similarity index 100%
rename from spec/support/cases/h-review-aggregate-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-1.html
diff --git a/spec/support/cases/h-review-aggregate-1.js b/spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-1.js
similarity index 100%
rename from spec/support/cases/h-review-aggregate-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-1.js
diff --git a/spec/support/cases/h-review-aggregate-2.html b/spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-2.html
similarity index 100%
rename from spec/support/cases/h-review-aggregate-2.html
rename to spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-2.html
diff --git a/spec/support/cases/h-review-aggregate-2.js b/spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-2.js
similarity index 100%
rename from spec/support/cases/h-review-aggregate-2.js
rename to spec/support/cases/microformat2-node.jit.su/h-review-aggregate/h-review-aggregate-2.js
diff --git a/spec/support/cases/h-review-0.html b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-0.html
similarity index 100%
rename from spec/support/cases/h-review-0.html
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-0.html
diff --git a/spec/support/cases/h-review-0.js b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-0.js
similarity index 100%
rename from spec/support/cases/h-review-0.js
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-0.js
diff --git a/spec/support/cases/h-review-1.html b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-1.html
similarity index 100%
rename from spec/support/cases/h-review-1.html
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-1.html
diff --git a/spec/support/cases/h-review-1.js b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-1.js
similarity index 100%
rename from spec/support/cases/h-review-1.js
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-1.js
diff --git a/spec/support/cases/h-review-2.html b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-2.html
similarity index 100%
rename from spec/support/cases/h-review-2.html
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-2.html
diff --git a/spec/support/cases/h-review-2.js b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-2.js
similarity index 100%
rename from spec/support/cases/h-review-2.js
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-2.js
diff --git a/spec/support/cases/h-review-3.html b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-3.html
similarity index 100%
rename from spec/support/cases/h-review-3.html
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-3.html
diff --git a/spec/support/cases/h-review-3.js b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-3.js
similarity index 100%
rename from spec/support/cases/h-review-3.js
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-3.js
diff --git a/spec/support/cases/h-review-4.html b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-4.html
similarity index 100%
rename from spec/support/cases/h-review-4.html
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-4.html
diff --git a/spec/support/cases/h-review-4.js b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-4.js
similarity index 100%
rename from spec/support/cases/h-review-4.js
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-4.js
diff --git a/spec/support/cases/h-review-5.html b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-5.html
similarity index 100%
rename from spec/support/cases/h-review-5.html
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-5.html
diff --git a/spec/support/cases/h-review-5.js b/spec/support/cases/microformat2-node.jit.su/h-review/h-review-5.js
similarity index 100%
rename from spec/support/cases/h-review-5.js
rename to spec/support/cases/microformat2-node.jit.su/h-review/h-review-5.js
diff --git a/spec/support/cases/includes-0.html b/spec/support/cases/microformat2-node.jit.su/includes/includes-0.html
similarity index 100%
rename from spec/support/cases/includes-0.html
rename to spec/support/cases/microformat2-node.jit.su/includes/includes-0.html
diff --git a/spec/support/cases/includes-0.js b/spec/support/cases/microformat2-node.jit.su/includes/includes-0.js
similarity index 100%
rename from spec/support/cases/includes-0.js
rename to spec/support/cases/microformat2-node.jit.su/includes/includes-0.js
diff --git a/spec/support/cases/includes-1.html b/spec/support/cases/microformat2-node.jit.su/includes/includes-1.html
similarity index 100%
rename from spec/support/cases/includes-1.html
rename to spec/support/cases/microformat2-node.jit.su/includes/includes-1.html
diff --git a/spec/support/cases/includes-1.js b/spec/support/cases/microformat2-node.jit.su/includes/includes-1.js
similarity index 100%
rename from spec/support/cases/includes-1.js
rename to spec/support/cases/microformat2-node.jit.su/includes/includes-1.js
diff --git a/spec/support/cases/includes-2.html b/spec/support/cases/microformat2-node.jit.su/includes/includes-2.html
similarity index 100%
rename from spec/support/cases/includes-2.html
rename to spec/support/cases/microformat2-node.jit.su/includes/includes-2.html
diff --git a/spec/support/cases/includes-2.js b/spec/support/cases/microformat2-node.jit.su/includes/includes-2.js
similarity index 100%
rename from spec/support/cases/includes-2.js
rename to spec/support/cases/microformat2-node.jit.su/includes/includes-2.js
diff --git a/spec/support/cases/includes-3.html b/spec/support/cases/microformat2-node.jit.su/includes/includes-3.html
similarity index 100%
rename from spec/support/cases/includes-3.html
rename to spec/support/cases/microformat2-node.jit.su/includes/includes-3.html
diff --git a/spec/support/cases/includes-3.js b/spec/support/cases/microformat2-node.jit.su/includes/includes-3.js
similarity index 100%
rename from spec/support/cases/includes-3.js
rename to spec/support/cases/microformat2-node.jit.su/includes/includes-3.js
diff --git a/spec/support/cases/includes-4.html b/spec/support/cases/microformat2-node.jit.su/includes/includes-4.html
similarity index 100%
rename from spec/support/cases/includes-4.html
rename to spec/support/cases/microformat2-node.jit.su/includes/includes-4.html
diff --git a/spec/support/cases/includes-4.js b/spec/support/cases/microformat2-node.jit.su/includes/includes-4.js
similarity index 100%
rename from spec/support/cases/includes-4.js
rename to spec/support/cases/microformat2-node.jit.su/includes/includes-4.js
diff --git a/spec/support/cases/rel-0.html b/spec/support/cases/microformat2-node.jit.su/rel/rel-0.html
similarity index 100%
rename from spec/support/cases/rel-0.html
rename to spec/support/cases/microformat2-node.jit.su/rel/rel-0.html
diff --git a/spec/support/cases/rel-0.js b/spec/support/cases/microformat2-node.jit.su/rel/rel-0.js
similarity index 100%
rename from spec/support/cases/rel-0.js
rename to spec/support/cases/microformat2-node.jit.su/rel/rel-0.js
diff --git a/spec/support/cases/rel-1.html b/spec/support/cases/microformat2-node.jit.su/rel/rel-1.html
similarity index 100%
rename from spec/support/cases/rel-1.html
rename to spec/support/cases/microformat2-node.jit.su/rel/rel-1.html
diff --git a/spec/support/cases/rel-1.js b/spec/support/cases/microformat2-node.jit.su/rel/rel-1.js
similarity index 100%
rename from spec/support/cases/rel-1.js
rename to spec/support/cases/microformat2-node.jit.su/rel/rel-1.js
diff --git a/spec/support/cases/rel-2.html b/spec/support/cases/microformat2-node.jit.su/rel/rel-2.html
similarity index 100%
rename from spec/support/cases/rel-2.html
rename to spec/support/cases/microformat2-node.jit.su/rel/rel-2.html
diff --git a/spec/support/cases/rel-2.js b/spec/support/cases/microformat2-node.jit.su/rel/rel-2.js
similarity index 100%
rename from spec/support/cases/rel-2.js
rename to spec/support/cases/microformat2-node.jit.su/rel/rel-2.js
diff --git a/spec/support/cases/rel-3.html b/spec/support/cases/microformat2-node.jit.su/rel/rel-3.html
similarity index 100%
rename from spec/support/cases/rel-3.html
rename to spec/support/cases/microformat2-node.jit.su/rel/rel-3.html
diff --git a/spec/support/cases/rel-3.js b/spec/support/cases/microformat2-node.jit.su/rel/rel-3.js
similarity index 100%
rename from spec/support/cases/rel-3.js
rename to spec/support/cases/microformat2-node.jit.su/rel/rel-3.js
diff --git a/spec/support/cases/rel-4.html b/spec/support/cases/microformat2-node.jit.su/rel/rel-4.html
similarity index 100%
rename from spec/support/cases/rel-4.html
rename to spec/support/cases/microformat2-node.jit.su/rel/rel-4.html
diff --git a/spec/support/cases/rel-4.js b/spec/support/cases/microformat2-node.jit.su/rel/rel-4.js
similarity index 100%
rename from spec/support/cases/rel-4.js
rename to spec/support/cases/microformat2-node.jit.su/rel/rel-4.js
diff --git a/spec/support/cases/microformats-2-1.html b/spec/support/cases/microformats-2-1.html
deleted file mode 100644
index c2a65ad..0000000
--- a/spec/support/cases/microformats-2-1.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!-- http://microformats.org/wiki/microformats-2 -->
-<a class="h-card" href="http://benward.me">Ben Ward</a>
\ No newline at end of file
diff --git a/spec/support/cases/microformats-2-3.html b/spec/support/cases/microformats.org/microformats-2/microformats-2-3.html
similarity index 100%
rename from spec/support/cases/microformats-2-3.html
rename to spec/support/cases/microformats.org/microformats-2/microformats-2-3.html
diff --git a/spec/support/cases/microformats-2-3.js b/spec/support/cases/microformats.org/microformats-2/microformats-2-3.js
similarity index 100%
rename from spec/support/cases/microformats-2-3.js
rename to spec/support/cases/microformats.org/microformats-2/microformats-2-3.js
diff --git a/spec/support/cases/microformats-2-5.html b/spec/support/cases/microformats.org/microformats-2/microformats-2-5.html
similarity index 100%
rename from spec/support/cases/microformats-2-5.html
rename to spec/support/cases/microformats.org/microformats-2/microformats-2-5.html
diff --git a/spec/support/cases/microformats-2-5.js b/spec/support/cases/microformats.org/microformats-2/microformats-2-5.js
similarity index 100%
rename from spec/support/cases/microformats-2-5.js
rename to spec/support/cases/microformats.org/microformats-2/microformats-2-5.js
diff --git a/spec/support/cases/microformats-2-0.html b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-0.html
similarity index 54%
rename from spec/support/cases/microformats-2-0.html
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-0.html
index 8b05a7c..8435438 100644
--- a/spec/support/cases/microformats-2-0.html
+++ b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-0.html
@@ -1,2 +1,2 @@
 <!-- http://microformats.org/wiki/microformats-2 -->
-<span class="h-card">Frances Berriman</span>
\ No newline at end of file
+<span class="h-card">Frances Berriman</span>
diff --git a/spec/support/cases/microformats-2-0.js b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-0.js
similarity index 66%
rename from spec/support/cases/microformats-2-0.js
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-0.js
index 9056a82..0344aa2 100644
--- a/spec/support/cases/microformats-2-0.js
+++ b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-0.js
@@ -1,9 +1,9 @@
 // http://microformats.org/wiki/microformats-2
 {
-  "items": [{ 
+  "items": [{
     "type": ["h-card"],
     "properties": {
-      "name": ["Frances Berriman"] 
+      "name": ["Frances Berriman"]
     }
   }]
-}
\ No newline at end of file
+}
diff --git a/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-1.html b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-1.html
new file mode 100644
index 0000000..bdf0099
--- /dev/null
+++ b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-1.html
@@ -0,0 +1,2 @@
+<!-- http://microformats.org/wiki/microformats-2 -->
+<a class="h-card" href="http://benward.me">Ben Ward</a>
diff --git a/spec/support/cases/microformats-2-1.js b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-1.js
similarity index 100%
rename from spec/support/cases/microformats-2-1.js
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-1.js
diff --git a/spec/support/cases/microformats-2-2.html b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-2.html
similarity index 97%
rename from spec/support/cases/microformats-2-2.html
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-2.html
index 520b5f4..c1e0612 100644
--- a/spec/support/cases/microformats-2-2.html
+++ b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-2.html
@@ -2,4 +2,4 @@
 <a class="h-card" href="http://rohit.khare.org/">
  <img alt="Rohit Khare"
       src="https://s3.amazonaws.com/twitter_production/profile_images/53307499/180px-Rohit-sq_bigger.jpg" />
-</a>
\ No newline at end of file
+</a>
diff --git a/spec/support/cases/microformats-2-2.js b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-2.js
similarity index 100%
rename from spec/support/cases/microformats-2-2.js
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-2.js
diff --git a/spec/support/cases/microformats-2-4.html b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-4.html
similarity index 70%
rename from spec/support/cases/microformats-2-4.html
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-4.html
index 0325007..4423138 100644
--- a/spec/support/cases/microformats-2-4.html
+++ b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-4.html
@@ -3,14 +3,14 @@
   <a class="p-name u-url" href="http://indiewebcamp.com/2012">
     IndieWebCamp 2012
   </a>
-  from <time class="dt-start">2012-06-30</time> 
-  to <time class="dt-end">2012-07-01</time> at 
+  from <time class="dt-start">2012-06-30</time>
+  to <time class="dt-end">2012-07-01</time> at
   <span class="p-location h-card">
     <a class="p-name p-org u-url" href="http://geoloqi.com/">
       Geoloqi
-    </a>, 
-    <span class="p-street-address">920 SW 3rd Ave. Suite 400</span>, 
-    <span class="p-locality">Portland</span>, 
+    </a>,
+    <span class="p-street-address">920 SW 3rd Ave. Suite 400</span>,
+    <span class="p-locality">Portland</span>,
     <abbr class="p-region" title="Oregon">OR</abbr>
   </span>
-</div>
\ No newline at end of file
+</div>
diff --git a/spec/support/cases/microformats-2-4.js b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-4.js
similarity index 100%
rename from spec/support/cases/microformats-2-4.js
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-4.js
diff --git a/spec/support/cases/microformats-2-6.html b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-6.html
similarity index 61%
rename from spec/support/cases/microformats-2-6.html
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-6.html
index cacd398..14faf36 100644
--- a/spec/support/cases/microformats-2-6.html
+++ b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-6.html
@@ -1,9 +1,9 @@
 <!-- http://microformats.org/wiki/microformats-2 -->
 <div class="h-card">
   <a class="p-name u-url"
-     href="http://blog.lizardwrangler.com/" 
-    >Mitchell Baker</a> 
-  (<a class="p-org h-card" 
+     href="http://blog.lizardwrangler.com/"
+    >Mitchell Baker</a>
+  (<a class="p-org h-card"
       href="http://mozilla.org/"
      >Mozilla Foundation</a>)
-</div>
\ No newline at end of file
+</div>
diff --git a/spec/support/cases/microformats-2-6.js b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-6.js
similarity index 100%
rename from spec/support/cases/microformats-2-6.js
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-6.js
diff --git a/spec/support/cases/microformats-2-7.html b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-7.html
similarity index 59%
rename from spec/support/cases/microformats-2-7.html
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-7.html
index 00e6951..bb6cef9 100644
--- a/spec/support/cases/microformats-2-7.html
+++ b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-7.html
@@ -1,9 +1,9 @@
 <!-- http://microformats.org/wiki/microformats-2 -->
 <div class="h-card">
   <a class="p-name u-url"
-     href="http://blog.lizardwrangler.com/" 
-    >Mitchell Baker</a> 
-  (<a class="p-org h-card h-org" 
+     href="http://blog.lizardwrangler.com/"
+    >Mitchell Baker</a>
+  (<a class="p-org h-card h-org"
       href="http://mozilla.org/"
      >Mozilla Foundation</a>)
-</div>
\ No newline at end of file
+</div>
diff --git a/spec/support/cases/microformats-2-7.js b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-7.js
similarity index 100%
rename from spec/support/cases/microformats-2-7.js
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-7.js
diff --git a/spec/support/cases/microformats-2-8.html b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-8.html
similarity index 61%
rename from spec/support/cases/microformats-2-8.html
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-8.html
index ccf3c58..3d29349 100644
--- a/spec/support/cases/microformats-2-8.html
+++ b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-8.html
@@ -1,9 +1,9 @@
 <!-- http://microformats.org/wiki/microformats-2 -->
 <div class="h-card">
   <a class="p-name u-url"
-     href="http://blog.lizardwrangler.com/" 
-    >Mitchell Baker</a> 
-  (<a class="h-org h-card" 
+     href="http://blog.lizardwrangler.com/"
+    >Mitchell Baker</a>
+  (<a class="h-org h-card"
       href="http://mozilla.org/"
      >Mozilla Foundation</a>)
-</div>
\ No newline at end of file
+</div>
diff --git a/spec/support/cases/microformats-2-8.js b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-8.js
similarity index 100%
rename from spec/support/cases/microformats-2-8.js
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-8.js
diff --git a/spec/support/cases/microformats-2-9.html b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-9.html
similarity index 62%
rename from spec/support/cases/microformats-2-9.html
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-9.html
index 4afe112..b7242b9 100644
--- a/spec/support/cases/microformats-2-9.html
+++ b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-9.html
@@ -1,9 +1,9 @@
 <!-- http://microformats.org/wiki/microformats-2 -->
 <div class="h-card">
   <a class="p-name u-url"
-     href="http://blog.lizardwrangler.com/" 
-    >Mitchell Baker</a> 
-  (<a class="h-card" 
+     href="http://blog.lizardwrangler.com/"
+    >Mitchell Baker</a>
+  (<a class="h-card"
       href="http://mozilla.org/"
      >Mozilla Foundation</a>)
-</div>
\ No newline at end of file
+</div>
diff --git a/spec/support/cases/microformats-2-9.js b/spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-9.js
similarity index 100%
rename from spec/support/cases/microformats-2-9.js
rename to spec/support/cases/microformats.org/microformats-2/unimplemented/microformats-2-9.js