diff --git a/content/static/datenspuren/DS2011/index.de.html b/content/static/datenspuren/DS2011/index.de.html
deleted file mode 100644
index c09d1d476..000000000
--- a/content/static/datenspuren/DS2011/index.de.html
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
DS2011 - 0.3
-
- Datenspuren 2011
-
- Cloudy - mit der Aussicht auf Datenspuren
-
-
-
-
-
diff --git a/content/static/datenspuren/DS2011/speakers.de.html b/content/static/datenspuren/DS2011/speakers.de.html
deleted file mode 100644
index 05df10d78..000000000
--- a/content/static/datenspuren/DS2011/speakers.de.html
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
DS2011 - 0.3
-
- Datenspuren 2011
-
- Cloudy - mit der Aussicht auf Datenspuren
-
-
-
-
-
- Referent |
- Veranstaltungen |
-
-
-
-
-
-
-
-
- Bernd Fix
- |
-
-
- |
-
-
-
-
-
-
-
diff --git a/content/static/datenspuren/DS2011/style.css b/content/static/datenspuren/DS2011/style.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/content/static/datenspuren/DS2011/day_2011-10-15.de.html b/content/static/datenspuren/fahrplan/day_2011-10-15.de.html
similarity index 100%
rename from content/static/datenspuren/DS2011/day_2011-10-15.de.html
rename to content/static/datenspuren/fahrplan/day_2011-10-15.de.html
diff --git a/content/static/datenspuren/DS2011/day_2011-10-15.en.html b/content/static/datenspuren/fahrplan/day_2011-10-15.en.html
similarity index 100%
rename from content/static/datenspuren/DS2011/day_2011-10-15.en.html
rename to content/static/datenspuren/fahrplan/day_2011-10-15.en.html
diff --git a/content/static/datenspuren/DS2011/day_2011-10-16.de.html b/content/static/datenspuren/fahrplan/day_2011-10-16.de.html
similarity index 100%
rename from content/static/datenspuren/DS2011/day_2011-10-16.de.html
rename to content/static/datenspuren/fahrplan/day_2011-10-16.de.html
diff --git a/content/static/datenspuren/DS2011/day_2011-10-16.en.html b/content/static/datenspuren/fahrplan/day_2011-10-16.en.html
similarity index 100%
rename from content/static/datenspuren/DS2011/day_2011-10-16.en.html
rename to content/static/datenspuren/fahrplan/day_2011-10-16.en.html
diff --git a/content/static/datenspuren/fahrplan/events.de.html b/content/static/datenspuren/fahrplan/events.de.html
index d0dc3b6ba..205ba7fe7 100644
--- a/content/static/datenspuren/fahrplan/events.de.html
+++ b/content/static/datenspuren/fahrplan/events.de.html
@@ -1,53 +1,63 @@
-
+
+
-