diff --git a/configuration.yaml b/configuration.yaml
index 2acc7042..04a38602 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -18,6 +18,3 @@ timeline:
   - name: 'PTL elections'
     start: '2017-02-01T23:59'
     end:   '2017-02-07T23:45'
-
-past_elections:
-  - ocata
diff --git a/doc/source/_exts/candidates.py b/doc/source/_exts/candidates.py
index 2ab9ea03..e27b1847 100644
--- a/doc/source/_exts/candidates.py
+++ b/doc/source/_exts/candidates.py
@@ -44,7 +44,8 @@ def render_list(list_type, candidates_list):
 
 
 def build_archive(serie, list_type):
-    db_file = os.path.join(".", "doc", "source", serie, "%s.yaml" % list_type)
+    db_file = os.path.join(".", "doc", "source",
+                           "results", serie, "%s.yaml" % list_type)
     if not os.path.isfile(db_file):
         return
     db = yaml.safe_load(open(db_file))
@@ -56,7 +57,8 @@ def build_archive(serie, list_type):
                 db['tags']['TC-APPOINTED'] = True
             elif candidate['elected'] == 'INCUMBENT-PTL':
                 db['tags']['INCUMBENT-PTL'] = True
-    output = os.path.join(".", "doc", "source", serie, "%s.rst" % list_type)
+    output = os.path.join(".", "doc", "source",
+                          "results", serie, "%s.rst" % list_type)
     template_name = "%s_archive.jinja" % list_type
     template_dir = os.path.join(".", "doc", "source", "_exts")
     with open(output, "wb") as out:
@@ -83,11 +85,12 @@ def build_lists(app):
         "    :titlesonly:",
         ""
     ]
-    for previous in utils.conf['past_elections']:
+    archived_dir = os.path.join(".", "doc", "source", "results")
+    for previous in os.listdir(archived_dir):
         if build_archive(previous, "ptl"):
-            previous_toc.append("    %s/ptl.rst" % previous)
+            previous_toc.append("    results/%s/ptl.rst" % previous)
         if build_archive(previous, "tc"):
-            previous_toc.append("    %s/tc.rst" % previous)
+            previous_toc.append("    results/%s/tc.rst" % previous)
     toc = os.path.join(".", "doc", "source", "archive_toc.rst")
     open(toc, "w").write("\n".join(previous_toc))
 
diff --git a/doc/source/ocata/ptl.yaml b/doc/source/results/ocata/ptl.yaml
similarity index 100%
rename from doc/source/ocata/ptl.yaml
rename to doc/source/results/ocata/ptl.yaml
diff --git a/doc/source/ocata/tc.yaml b/doc/source/results/ocata/tc.yaml
similarity index 100%
rename from doc/source/ocata/tc.yaml
rename to doc/source/results/ocata/tc.yaml
diff --git a/openstack_election/cmds/close_election.py b/openstack_election/cmds/close_election.py
index 52226829..f39febfa 100755
--- a/openstack_election/cmds/close_election.py
+++ b/openstack_election/cmds/close_election.py
@@ -83,7 +83,8 @@ def main():
 
     args = parser.parse_args()
 
-    args.outputdir = os.path.join(args.basedir, 'doc', 'source', args.release)
+    args.outputdir = os.path.join(args.basedir, 'doc', 'source',
+                                  'results', args.release)
     args.outputdir = os.path.expanduser(args.outputdir)
 
     if not os.path.isdir(args.outputdir):
diff --git a/results/.placeholder b/results/.placeholder
deleted file mode 100644
index e69de29b..00000000