diff --git a/data/speakers/2016minneapolis/allan-espinosa.yml b/data/speakers/2016/minneapolis/allan-espinosa.yml
similarity index 100%
rename from data/speakers/2016minneapolis/allan-espinosa.yml
rename to data/speakers/2016/minneapolis/allan-espinosa.yml
diff --git a/data/speakers/2016minneapolis/ben-zvan.yml b/data/speakers/2016/minneapolis/ben-zvan.yml
similarity index 100%
rename from data/speakers/2016minneapolis/ben-zvan.yml
rename to data/speakers/2016/minneapolis/ben-zvan.yml
diff --git a/data/speakers/2016minneapolis/charity-majors.yml b/data/speakers/2016/minneapolis/charity-majors.yml
similarity index 100%
rename from data/speakers/2016minneapolis/charity-majors.yml
rename to data/speakers/2016/minneapolis/charity-majors.yml
diff --git a/data/speakers/2016minneapolis/jamie-reidesel.yml b/data/speakers/2016/minneapolis/jamie-reidesel.yml
similarity index 100%
rename from data/speakers/2016minneapolis/jamie-reidesel.yml
rename to data/speakers/2016/minneapolis/jamie-reidesel.yml
diff --git a/data/speakers/2016minneapolis/jeff-smith.yml b/data/speakers/2016/minneapolis/jeff-smith.yml
similarity index 100%
rename from data/speakers/2016minneapolis/jeff-smith.yml
rename to data/speakers/2016/minneapolis/jeff-smith.yml
diff --git a/data/speakers/2016minneapolis/megan-carney.yml b/data/speakers/2016/minneapolis/megan-carney.yml
similarity index 100%
rename from data/speakers/2016minneapolis/megan-carney.yml
rename to data/speakers/2016/minneapolis/megan-carney.yml
diff --git a/data/speakers/2016minneapolis/nicole-forsgren.yml b/data/speakers/2016/minneapolis/nicole-forsgren.yml
similarity index 100%
rename from data/speakers/2016minneapolis/nicole-forsgren.yml
rename to data/speakers/2016/minneapolis/nicole-forsgren.yml
diff --git a/data/speakers/2016minneapolis/sarah-goff-dupont.yml b/data/speakers/2016/minneapolis/sarah-goff-dupont.yml
similarity index 100%
rename from data/speakers/2016minneapolis/sarah-goff-dupont.yml
rename to data/speakers/2016/minneapolis/sarah-goff-dupont.yml
diff --git a/themes/devopsdays-legacy/layouts/talk/single.html b/themes/devopsdays-legacy/layouts/talk/single.html
index 72eabbf1a57..5a7b4c5ca4d 100644
--- a/themes/devopsdays-legacy/layouts/talk/single.html
+++ b/themes/devopsdays-legacy/layouts/talk/single.html
@@ -29,8 +29,15 @@ <h3>
 
 
  <!-- speaker code begin -->
-
- {{ range $fname, $s := index .Site.Data.speakers (printf "%s%s" $e.year (lower $e.city) ) }}
+ {{/*
+   For future reference, this range listed below is going to be a key element for when we refactor the data directory
+   Notice how you pass the variables, etc. So the new code would probably be something like this:
+   .Site.Data.events $e.year "speakers" (printf "%s" (lower $e.city))
+   and to get at the meta.yml for the city it will be
+   .Site.Data.events $e.year (printf "%s" (lower $e.city))
+   - mattstratton
+ */}}
+ {{ range $fname, $s := index .Site.Data.speakers $e.year (printf "%s" (lower $e.city)) }}
    {{ if eq $fname ($.Title | urlize) }}
      <h2>Speaker</h2>
      <h3>{{ $s.name }}</h3>