diff --git a/Makefile b/Makefile index f2f493789..d38c37c18 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ PROCESSOR=xsltproc PFLAGS= # XML-Validator VALIDATOR=xmllint -VFLAGS=--noout #--valid +VFLAGS=--noout --valid # Downloadmanager (Alternativ: curl, fetch): WGET=wget --timestamping # rsync @@ -15,53 +15,45 @@ EDITOR?=vim # Browser BROWSER?=links -# Verzeichnis, in das exportiert werden soll -DESTDIR?=www-export - ### Ressourcen ### # XSLT-Stylesheets: STYLE=xsl/xhtml.xsl DS_STYLE=xsl/datenspuren/xhtml.xsl -STYLE_RSS=xsl/rss.xsl -STYLE_ATOM=xsl/atom.xsl +# Document-Type-Definition: +DTD:=dtd/c3d2web.dtd # Navigationsleiste: NAVIGATION=content/navigation.xml -# XML-Skeletons -SKELETONS:=$(wildcard content/skel-*.xml) -SKEL=empty -# Zu verwendendes Skeleton -SKELFILE=content/skel-$(SKEL).xml -# Dateinamen der Inhalte: -CONTENT=$(PAGES) $(NEWS_PAGES) $(DS_PAGES) $(NEWSFILES) -# Chaosupdates +# Chaosupdates: WWW_CCC_DE_UPDATES=chaosupdates.rdf -PAGES:=$(patsubst content/%.xml, www/%.html, $(filter-out $(NAVIGATION) $(SKELETONS), $(wildcard content/*.xml))) -NEWS_PAGES:=$(patsubst content/news/%.xml, www/news/%.html, $(wildcard content/news/*.xml)) -DS_PAGES:=$(patsubst content/datenspuren/%.xml, www/datenspuren/%.html, $(wildcard content/datenspuren/*.xml)) www/datenspuren/schedule.html -NEWSINDEX:=content/news.xml -NEWSITEMS:=$(filter-out $(NEWSINDEX), $(wildcard content/news/*.xml)) +### Ziele ### +# Dateinamen der zu erzeugenden html-Dateien: +CONTENT=$(PAGES) $(NEWS_PAGES) $(DS_PAGES) $(NEWSFILES) + +# 'normale' Seiten: +PAGES:=$(patsubst content/pages/%.xml, build/%.html, $(wildcard content/pages/*.xml)) +# Seiten zu einzelnen News-Items: +NEWS_PAGES:=$(patsubst content/news/%.xml, build/news/%.html, $(wildcard content/news/*.xml)) +# News-Index und Feeds: NEWSFILES:=www/news.html www/news-rss.xml www/news-atom.xml -DTD:=dtd/c3d2web.dtd +# Datenspuren-Seiten: +DS_PAGES:=$(patsubst content/datenspuren/%.xml, www/datenspuren/%.html, $(wildcard content/datenspuren/*.xml)) www/datenspuren/schedule.html + +# Quellen + +NEWSITEMS:=$(wildcard content/news/*.xml)) CLEAN=$(CONTENT) $(NEWSFILES) $(WWW_CCC_DE_UPDATES) + ### Defaults ### -.PHONY: export contents clean mrproper all install check mirrorcontent -.PRECIOUS: content/%.xml www/%.html content/datenspuren/%.xml www/datenspuren/%.html + +www: $(CONTENT) $(DTD) + $(RSYNC) $(RSYNC_FLAGS) content/static build/ $@ + .SILENT: check - -all: contents - -install: export - -contents: $(CONTENT) $(DTD) - -export: contents - $(RSYNC) $(RSYNC_FLAGS) --exclude=".svn/" www/ $(WWW_CCC_DE_UPDATES) content dtd xsl $(DESTDIR)/ - - +.PHONY: check check: $(PAGES) - ln -sfn $(PWD)/dtd www/DTD + # XXX for page in $^ ; do \ echo "Checking $${page}..." ; \ $(VALIDATOR) $(VFLAGS) $${page} ; \ @@ -70,41 +62,29 @@ check: $(PAGES) ### Regeln für den XSLT-Prozess ### www/news.html: $(STYLE) -www/news-rss.xml: $(STYLE_RSS) -www/news-atom.xml: $(STYLE_ATOM) +www/news-rss.xml: xsl/rss.xsl +www/news-atom.xml: xsl/atom.xsl -$(NEWSFILES): $(NAVIGATION) $(NEWSINDEX) - $(VALIDATOR) $(VFLAGS) $(NEWSINDEX) - $(PROCESSOR) $(PFLAGS) -o $@ $(filter-out $(NEWSITEMS) $(NAVIGATION) $(NEWSINDEX),$^) $(NEWSINDEX) - -$(NEWSINDEX): $(NEWSITEMS) Makefile +www/news.html www/news-rss.xml www/news-atom.xml: $(NAVIGATION) $(NEWSITEMS) for item in $(NEWSITEMS) ; do \ $(VALIDATOR) $(VFLAGS) $${item} || exit 1 ; \ done - { echo '' ; \ - echo '' ; \ - echo '' ; \ - echo ""; \ - echo " "; \ - for item in $(patsubst content/news/%,news/%,$(NEWSITEMS)) ; do \ - echo " $${item}"; \ - done; \ - echo " "; \ - echo ""; } > $@ + sh scripts/gen_news.xml.sh $(NEWS_ITEMS) | $(PROCESSOR) $(PFLAGS) -o $@ - content/datenspuren/schedule.xml: www/datenspuren/fahrplan/days.de.html cp $< $@ +build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) + $(VALIDATOR) $(VFLAGS) $< + $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $< + www/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE) # -- MNE-20060421: Lt. Astro geht Validierung noch nicht mit dem Fahrplan, # daher fuer Datenspuren auskommentiert $(VALIDATOR) $(VFLAGS) $< $(PROCESSOR) $(PFLAGS) -o $@ $(DS_STYLE) $< -www/%.html: content/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) - $(VALIDATOR) $(VFLAGS) $< - $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $< #www/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) # $(VALIDATOR) $(VFLAGS) $< diff --git a/content/impressum.xml b/content/pages/impressum.xml similarity index 100% rename from content/impressum.xml rename to content/pages/impressum.xml diff --git a/content/kontakt.xml b/content/pages/kontakt.xml similarity index 100% rename from content/kontakt.xml rename to content/pages/kontakt.xml diff --git a/content/mailingliste.xml b/content/pages/mailingliste.xml similarity index 100% rename from content/mailingliste.xml rename to content/pages/mailingliste.xml diff --git a/content/silc.xml b/content/pages/silc.xml similarity index 100% rename from content/silc.xml rename to content/pages/silc.xml diff --git a/content/wiki.xml b/content/pages/wiki.xml similarity index 100% rename from content/wiki.xml rename to content/pages/wiki.xml diff --git a/content/skel-empty.xml b/content/skel-empty.xml deleted file mode 100644 index a6c0a0b7b..000000000 --- a/content/skel-empty.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - -

-

-
diff --git a/www/.htaccess b/content/static/.htaccess similarity index 100% rename from www/.htaccess rename to content/static/.htaccess diff --git a/www/datenspuren/2004/aftershow_party.html b/content/static/datenspuren/2004/aftershow_party.html similarity index 100% rename from www/datenspuren/2004/aftershow_party.html rename to content/static/datenspuren/2004/aftershow_party.html diff --git a/www/datenspuren/2004/color-scheme.css b/content/static/datenspuren/2004/color-scheme.css similarity index 100% rename from www/datenspuren/2004/color-scheme.css rename to content/static/datenspuren/2004/color-scheme.css diff --git a/www/datenspuren/2004/fahrplan.html b/content/static/datenspuren/2004/fahrplan.html similarity index 100% rename from www/datenspuren/2004/fahrplan.html rename to content/static/datenspuren/2004/fahrplan.html diff --git a/www/datenspuren/2004/fahrplan.pdf b/content/static/datenspuren/2004/fahrplan.pdf similarity index 100% rename from www/datenspuren/2004/fahrplan.pdf rename to content/static/datenspuren/2004/fahrplan.pdf diff --git a/www/datenspuren/2004/fahrplan_pdf.html b/content/static/datenspuren/2004/fahrplan_pdf.html similarity index 100% rename from www/datenspuren/2004/fahrplan_pdf.html rename to content/static/datenspuren/2004/fahrplan_pdf.html diff --git a/www/datenspuren/2004/flyer/ds_flyer_a4.pdf b/content/static/datenspuren/2004/flyer/ds_flyer_a4.pdf similarity index 100% rename from www/datenspuren/2004/flyer/ds_flyer_a4.pdf rename to content/static/datenspuren/2004/flyer/ds_flyer_a4.pdf diff --git a/www/datenspuren/2004/flyer/ds_minis_a4.pdf b/content/static/datenspuren/2004/flyer/ds_minis_a4.pdf similarity index 100% rename from www/datenspuren/2004/flyer/ds_minis_a4.pdf rename to content/static/datenspuren/2004/flyer/ds_minis_a4.pdf diff --git a/www/datenspuren/2004/flyer/ds_plakat_a3.pdf b/content/static/datenspuren/2004/flyer/ds_plakat_a3.pdf similarity index 100% rename from www/datenspuren/2004/flyer/ds_plakat_a3.pdf rename to content/static/datenspuren/2004/flyer/ds_plakat_a3.pdf diff --git a/www/datenspuren/2004/flyer/flyer.bak b/content/static/datenspuren/2004/flyer/flyer.bak similarity index 100% rename from www/datenspuren/2004/flyer/flyer.bak rename to content/static/datenspuren/2004/flyer/flyer.bak diff --git a/www/datenspuren/2004/flyer/flyer.html b/content/static/datenspuren/2004/flyer/flyer.html similarity index 100% rename from www/datenspuren/2004/flyer/flyer.html rename to content/static/datenspuren/2004/flyer/flyer.html diff --git a/www/datenspuren/2004/img/.xvpics/logo.gif b/content/static/datenspuren/2004/img/.xvpics/logo.gif similarity index 100% rename from www/datenspuren/2004/img/.xvpics/logo.gif rename to content/static/datenspuren/2004/img/.xvpics/logo.gif diff --git a/www/datenspuren/2004/img/.xvpics/logo.jpg b/content/static/datenspuren/2004/img/.xvpics/logo.jpg similarity index 100% rename from www/datenspuren/2004/img/.xvpics/logo.jpg rename to content/static/datenspuren/2004/img/.xvpics/logo.jpg diff --git a/www/datenspuren/2004/img/.xvpics/logo.png b/content/static/datenspuren/2004/img/.xvpics/logo.png similarity index 100% rename from www/datenspuren/2004/img/.xvpics/logo.png rename to content/static/datenspuren/2004/img/.xvpics/logo.png diff --git a/www/datenspuren/2004/img/anreise.png b/content/static/datenspuren/2004/img/anreise.png similarity index 100% rename from www/datenspuren/2004/img/anreise.png rename to content/static/datenspuren/2004/img/anreise.png diff --git a/www/datenspuren/2004/img/bad_logo.jpg b/content/static/datenspuren/2004/img/bad_logo.jpg similarity index 100% rename from www/datenspuren/2004/img/bad_logo.jpg rename to content/static/datenspuren/2004/img/bad_logo.jpg diff --git a/www/datenspuren/2004/img/datenspuren.gif b/content/static/datenspuren/2004/img/datenspuren.gif similarity index 100% rename from www/datenspuren/2004/img/datenspuren.gif rename to content/static/datenspuren/2004/img/datenspuren.gif diff --git a/www/datenspuren/2004/img/debian.gif b/content/static/datenspuren/2004/img/debian.gif similarity index 100% rename from www/datenspuren/2004/img/debian.gif rename to content/static/datenspuren/2004/img/debian.gif diff --git a/www/datenspuren/2004/img/eye.jpg b/content/static/datenspuren/2004/img/eye.jpg similarity index 100% rename from www/datenspuren/2004/img/eye.jpg rename to content/static/datenspuren/2004/img/eye.jpg diff --git a/www/datenspuren/2004/img/img.bak b/content/static/datenspuren/2004/img/img.bak similarity index 100% rename from www/datenspuren/2004/img/img.bak rename to content/static/datenspuren/2004/img/img.bak diff --git a/www/datenspuren/2004/img/logo.gif b/content/static/datenspuren/2004/img/logo.gif similarity index 100% rename from www/datenspuren/2004/img/logo.gif rename to content/static/datenspuren/2004/img/logo.gif diff --git a/www/datenspuren/2004/img/logo.jpg b/content/static/datenspuren/2004/img/logo.jpg similarity index 100% rename from www/datenspuren/2004/img/logo.jpg rename to content/static/datenspuren/2004/img/logo.jpg diff --git a/www/datenspuren/2004/img/logo.png b/content/static/datenspuren/2004/img/logo.png similarity index 100% rename from www/datenspuren/2004/img/logo.png rename to content/static/datenspuren/2004/img/logo.png diff --git a/www/datenspuren/2004/img/pentacon.jpg b/content/static/datenspuren/2004/img/pentacon.jpg similarity index 100% rename from www/datenspuren/2004/img/pentacon.jpg rename to content/static/datenspuren/2004/img/pentacon.jpg diff --git a/www/datenspuren/2004/img/privacy.eye.jpg b/content/static/datenspuren/2004/img/privacy.eye.jpg similarity index 100% rename from www/datenspuren/2004/img/privacy.eye.jpg rename to content/static/datenspuren/2004/img/privacy.eye.jpg diff --git a/www/datenspuren/2004/img/valid_rss.gif b/content/static/datenspuren/2004/img/valid_rss.gif similarity index 100% rename from www/datenspuren/2004/img/valid_rss.gif rename to content/static/datenspuren/2004/img/valid_rss.gif diff --git a/www/datenspuren/2004/img/valid_xhtml.png b/content/static/datenspuren/2004/img/valid_xhtml.png similarity index 100% rename from www/datenspuren/2004/img/valid_xhtml.png rename to content/static/datenspuren/2004/img/valid_xhtml.png diff --git a/www/datenspuren/2004/index.html b/content/static/datenspuren/2004/index.html similarity index 100% rename from www/datenspuren/2004/index.html rename to content/static/datenspuren/2004/index.html diff --git a/www/datenspuren/2004/index.rss b/content/static/datenspuren/2004/index.rss similarity index 100% rename from www/datenspuren/2004/index.rss rename to content/static/datenspuren/2004/index.rss diff --git a/www/datenspuren/2004/keysigning.html b/content/static/datenspuren/2004/keysigning.html similarity index 100% rename from www/datenspuren/2004/keysigning.html rename to content/static/datenspuren/2004/keysigning.html diff --git a/www/datenspuren/2004/lesestoff.html b/content/static/datenspuren/2004/lesestoff.html similarity index 100% rename from www/datenspuren/2004/lesestoff.html rename to content/static/datenspuren/2004/lesestoff.html diff --git a/www/datenspuren/2004/links.html b/content/static/datenspuren/2004/links.html similarity index 100% rename from www/datenspuren/2004/links.html rename to content/static/datenspuren/2004/links.html diff --git a/www/datenspuren/2004/ort.html b/content/static/datenspuren/2004/ort.html similarity index 100% rename from www/datenspuren/2004/ort.html rename to content/static/datenspuren/2004/ort.html diff --git a/www/datenspuren/2004/referenten.html b/content/static/datenspuren/2004/referenten.html similarity index 100% rename from www/datenspuren/2004/referenten.html rename to content/static/datenspuren/2004/referenten.html diff --git a/www/datenspuren/2004/sonstiges.html b/content/static/datenspuren/2004/sonstiges.html similarity index 100% rename from www/datenspuren/2004/sonstiges.html rename to content/static/datenspuren/2004/sonstiges.html diff --git a/www/datenspuren/2004/style.css b/content/static/datenspuren/2004/style.css similarity index 100% rename from www/datenspuren/2004/style.css rename to content/static/datenspuren/2004/style.css diff --git a/www/datenspuren/2004/test b/content/static/datenspuren/2004/test similarity index 100% rename from www/datenspuren/2004/test rename to content/static/datenspuren/2004/test diff --git a/www/datenspuren/2004/vortraege.html b/content/static/datenspuren/2004/vortraege.html similarity index 100% rename from www/datenspuren/2004/vortraege.html rename to content/static/datenspuren/2004/vortraege.html diff --git a/www/datenspuren/2004/vortraege/anon_jap.html b/content/static/datenspuren/2004/vortraege/anon_jap.html similarity index 100% rename from www/datenspuren/2004/vortraege/anon_jap.html rename to content/static/datenspuren/2004/vortraege/anon_jap.html diff --git a/www/datenspuren/2004/vortraege/datenschutz.html b/content/static/datenspuren/2004/vortraege/datenschutz.html similarity index 100% rename from www/datenspuren/2004/vortraege/datenschutz.html rename to content/static/datenspuren/2004/vortraege/datenschutz.html diff --git a/www/datenspuren/2004/vortraege/email_verschluesselung.html b/content/static/datenspuren/2004/vortraege/email_verschluesselung.html similarity index 100% rename from www/datenspuren/2004/vortraege/email_verschluesselung.html rename to content/static/datenspuren/2004/vortraege/email_verschluesselung.html diff --git a/www/datenspuren/2004/vortraege/ethik_infoverarbeitung.html b/content/static/datenspuren/2004/vortraege/ethik_infoverarbeitung.html similarity index 100% rename from www/datenspuren/2004/vortraege/ethik_infoverarbeitung.html rename to content/static/datenspuren/2004/vortraege/ethik_infoverarbeitung.html diff --git a/www/datenspuren/2004/vortraege/kallisti.html b/content/static/datenspuren/2004/vortraege/kallisti.html similarity index 100% rename from www/datenspuren/2004/vortraege/kallisti.html rename to content/static/datenspuren/2004/vortraege/kallisti.html diff --git a/www/datenspuren/2004/vortraege/keynote.html b/content/static/datenspuren/2004/vortraege/keynote.html similarity index 100% rename from www/datenspuren/2004/vortraege/keynote.html rename to content/static/datenspuren/2004/vortraege/keynote.html diff --git a/www/datenspuren/2004/vortraege/lawful_interception.html b/content/static/datenspuren/2004/vortraege/lawful_interception.html similarity index 100% rename from www/datenspuren/2004/vortraege/lawful_interception.html rename to content/static/datenspuren/2004/vortraege/lawful_interception.html diff --git a/www/datenspuren/2004/vortraege/material/MutMenschMacintosh.pdf b/content/static/datenspuren/2004/vortraege/material/MutMenschMacintosh.pdf similarity index 100% rename from www/datenspuren/2004/vortraege/material/MutMenschMacintosh.pdf rename to content/static/datenspuren/2004/vortraege/material/MutMenschMacintosh.pdf diff --git a/www/datenspuren/2004/vortraege/material/videoueberwachung.pdf b/content/static/datenspuren/2004/vortraege/material/videoueberwachung.pdf similarity index 100% rename from www/datenspuren/2004/vortraege/material/videoueberwachung.pdf rename to content/static/datenspuren/2004/vortraege/material/videoueberwachung.pdf diff --git a/www/datenspuren/2004/vortraege/mautsystem.html b/content/static/datenspuren/2004/vortraege/mautsystem.html similarity index 100% rename from www/datenspuren/2004/vortraege/mautsystem.html rename to content/static/datenspuren/2004/vortraege/mautsystem.html diff --git a/www/datenspuren/2004/vortraege/mut_mensch_macintosh.html b/content/static/datenspuren/2004/vortraege/mut_mensch_macintosh.html similarity index 100% rename from www/datenspuren/2004/vortraege/mut_mensch_macintosh.html rename to content/static/datenspuren/2004/vortraege/mut_mensch_macintosh.html diff --git a/www/datenspuren/2004/vortraege/nichts_zu_verbergen.html b/content/static/datenspuren/2004/vortraege/nichts_zu_verbergen.html similarity index 100% rename from www/datenspuren/2004/vortraege/nichts_zu_verbergen.html rename to content/static/datenspuren/2004/vortraege/nichts_zu_verbergen.html diff --git a/www/datenspuren/2004/vortraege/podiumsdiskussion.html b/content/static/datenspuren/2004/vortraege/podiumsdiskussion.html similarity index 100% rename from www/datenspuren/2004/vortraege/podiumsdiskussion.html rename to content/static/datenspuren/2004/vortraege/podiumsdiskussion.html diff --git a/www/datenspuren/2004/vortraege/remailer_mix_webmailer.html b/content/static/datenspuren/2004/vortraege/remailer_mix_webmailer.html similarity index 100% rename from www/datenspuren/2004/vortraege/remailer_mix_webmailer.html rename to content/static/datenspuren/2004/vortraege/remailer_mix_webmailer.html diff --git a/www/datenspuren/2004/vortraege/share_it_or_not.html b/content/static/datenspuren/2004/vortraege/share_it_or_not.html similarity index 100% rename from www/datenspuren/2004/vortraege/share_it_or_not.html rename to content/static/datenspuren/2004/vortraege/share_it_or_not.html diff --git a/www/datenspuren/2004/vortraege/trusted_computing.html b/content/static/datenspuren/2004/vortraege/trusted_computing.html similarity index 100% rename from www/datenspuren/2004/vortraege/trusted_computing.html rename to content/static/datenspuren/2004/vortraege/trusted_computing.html diff --git a/www/datenspuren/2004/vortraege/videoueberwachung.html b/content/static/datenspuren/2004/vortraege/videoueberwachung.html similarity index 100% rename from www/datenspuren/2004/vortraege/videoueberwachung.html rename to content/static/datenspuren/2004/vortraege/videoueberwachung.html diff --git a/www/datenspuren/2004/vortraege/vorratsdatenspeicherung.html b/content/static/datenspuren/2004/vortraege/vorratsdatenspeicherung.html similarity index 100% rename from www/datenspuren/2004/vortraege/vorratsdatenspeicherung.html rename to content/static/datenspuren/2004/vortraege/vorratsdatenspeicherung.html diff --git a/www/datenspuren/2004/vortraege/vortraege.bak b/content/static/datenspuren/2004/vortraege/vortraege.bak similarity index 100% rename from www/datenspuren/2004/vortraege/vortraege.bak rename to content/static/datenspuren/2004/vortraege/vortraege.bak diff --git a/www/datenspuren/2004/workshops.html b/content/static/datenspuren/2004/workshops.html similarity index 100% rename from www/datenspuren/2004/workshops.html rename to content/static/datenspuren/2004/workshops.html diff --git a/www/datenspuren/2004/workshops/email_verschluesselung.html b/content/static/datenspuren/2004/workshops/email_verschluesselung.html similarity index 100% rename from www/datenspuren/2004/workshops/email_verschluesselung.html rename to content/static/datenspuren/2004/workshops/email_verschluesselung.html diff --git a/www/datenspuren/2004/workshops/sichere_online_kom.html b/content/static/datenspuren/2004/workshops/sichere_online_kom.html similarity index 100% rename from www/datenspuren/2004/workshops/sichere_online_kom.html rename to content/static/datenspuren/2004/workshops/sichere_online_kom.html diff --git a/www/datenspuren/2004/workshops/sicheres_websurfen.html b/content/static/datenspuren/2004/workshops/sicheres_websurfen.html similarity index 100% rename from www/datenspuren/2004/workshops/sicheres_websurfen.html rename to content/static/datenspuren/2004/workshops/sicheres_websurfen.html diff --git a/www/datenspuren/2004/workshops/workshops.bak b/content/static/datenspuren/2004/workshops/workshops.bak similarity index 100% rename from www/datenspuren/2004/workshops/workshops.bak rename to content/static/datenspuren/2004/workshops/workshops.bak diff --git a/www/datenspuren/2005/color-scheme.css b/content/static/datenspuren/2005/color-scheme.css similarity index 100% rename from www/datenspuren/2005/color-scheme.css rename to content/static/datenspuren/2005/color-scheme.css diff --git a/www/datenspuren/2005/fahrplan.ics b/content/static/datenspuren/2005/fahrplan.ics similarity index 100% rename from www/datenspuren/2005/fahrplan.ics rename to content/static/datenspuren/2005/fahrplan.ics diff --git a/www/datenspuren/2005/flyer_ds_2005.pdf b/content/static/datenspuren/2005/flyer_ds_2005.pdf similarity index 100% rename from www/datenspuren/2005/flyer_ds_2005.pdf rename to content/static/datenspuren/2005/flyer_ds_2005.pdf diff --git a/www/datenspuren/2005/index.html b/content/static/datenspuren/2005/index.html similarity index 100% rename from www/datenspuren/2005/index.html rename to content/static/datenspuren/2005/index.html diff --git a/www/datenspuren/2005/netzwerk.html b/content/static/datenspuren/2005/netzwerk.html similarity index 100% rename from www/datenspuren/2005/netzwerk.html rename to content/static/datenspuren/2005/netzwerk.html diff --git a/www/datenspuren/2005/ort.html b/content/static/datenspuren/2005/ort.html similarity index 100% rename from www/datenspuren/2005/ort.html rename to content/static/datenspuren/2005/ort.html diff --git a/www/datenspuren/2005/sonstiges.html b/content/static/datenspuren/2005/sonstiges.html similarity index 100% rename from www/datenspuren/2005/sonstiges.html rename to content/static/datenspuren/2005/sonstiges.html diff --git a/www/datenspuren/2005/style.css b/content/static/datenspuren/2005/style.css similarity index 100% rename from www/datenspuren/2005/style.css rename to content/static/datenspuren/2005/style.css diff --git a/www/datenspuren/2005/uebernachtung.html b/content/static/datenspuren/2005/uebernachtung.html similarity index 100% rename from www/datenspuren/2005/uebernachtung.html rename to content/static/datenspuren/2005/uebernachtung.html diff --git a/www/datenspuren/2005/vortraege.html b/content/static/datenspuren/2005/vortraege.html similarity index 100% rename from www/datenspuren/2005/vortraege.html rename to content/static/datenspuren/2005/vortraege.html diff --git a/www/datenspuren/2005/vortraege/ANON.pdf b/content/static/datenspuren/2005/vortraege/ANON.pdf similarity index 100% rename from www/datenspuren/2005/vortraege/ANON.pdf rename to content/static/datenspuren/2005/vortraege/ANON.pdf diff --git a/www/datenspuren/2005/vortraege/GSM Abhoeren Datenspuren.pdf b/content/static/datenspuren/2005/vortraege/GSM Abhoeren Datenspuren.pdf similarity index 100% rename from www/datenspuren/2005/vortraege/GSM Abhoeren Datenspuren.pdf rename to content/static/datenspuren/2005/vortraege/GSM Abhoeren Datenspuren.pdf diff --git a/www/datenspuren/2005/vortraege/Keynote.pdf b/content/static/datenspuren/2005/vortraege/Keynote.pdf similarity index 100% rename from www/datenspuren/2005/vortraege/Keynote.pdf rename to content/static/datenspuren/2005/vortraege/Keynote.pdf diff --git a/www/datenspuren/2005/vortraege/TK-Ueberwachung.pdf b/content/static/datenspuren/2005/vortraege/TK-Ueberwachung.pdf similarity index 100% rename from www/datenspuren/2005/vortraege/TK-Ueberwachung.pdf rename to content/static/datenspuren/2005/vortraege/TK-Ueberwachung.pdf diff --git a/www/datenspuren/2005/vortraege/Videoueberwachung-Argumente.pdf b/content/static/datenspuren/2005/vortraege/Videoueberwachung-Argumente.pdf similarity index 100% rename from www/datenspuren/2005/vortraege/Videoueberwachung-Argumente.pdf rename to content/static/datenspuren/2005/vortraege/Videoueberwachung-Argumente.pdf diff --git a/www/datenspuren/2005/vortraege/Vorratsdatenspeicherung.pdf b/content/static/datenspuren/2005/vortraege/Vorratsdatenspeicherung.pdf similarity index 100% rename from www/datenspuren/2005/vortraege/Vorratsdatenspeicherung.pdf rename to content/static/datenspuren/2005/vortraege/Vorratsdatenspeicherung.pdf diff --git a/www/datenspuren/2005/vortraege/biometrie.pdf b/content/static/datenspuren/2005/vortraege/biometrie.pdf similarity index 100% rename from www/datenspuren/2005/vortraege/biometrie.pdf rename to content/static/datenspuren/2005/vortraege/biometrie.pdf diff --git a/www/datenspuren/2005/vortraege/rfid_paranoia_innovation.pdf b/content/static/datenspuren/2005/vortraege/rfid_paranoia_innovation.pdf similarity index 100% rename from www/datenspuren/2005/vortraege/rfid_paranoia_innovation.pdf rename to content/static/datenspuren/2005/vortraege/rfid_paranoia_innovation.pdf diff --git a/www/datenspuren/fahrplan/day_1.de.html b/content/static/datenspuren/fahrplan/day_1.de.html similarity index 100% rename from www/datenspuren/fahrplan/day_1.de.html rename to content/static/datenspuren/fahrplan/day_1.de.html diff --git a/www/datenspuren/fahrplan/day_1.en.html b/content/static/datenspuren/fahrplan/day_1.en.html similarity index 100% rename from www/datenspuren/fahrplan/day_1.en.html rename to content/static/datenspuren/fahrplan/day_1.en.html diff --git a/www/datenspuren/fahrplan/day_2.de.html b/content/static/datenspuren/fahrplan/day_2.de.html similarity index 100% rename from www/datenspuren/fahrplan/day_2.de.html rename to content/static/datenspuren/fahrplan/day_2.de.html diff --git a/www/datenspuren/fahrplan/day_2.en.html b/content/static/datenspuren/fahrplan/day_2.en.html similarity index 100% rename from www/datenspuren/fahrplan/day_2.en.html rename to content/static/datenspuren/fahrplan/day_2.en.html diff --git a/www/datenspuren/fahrplan/days.de.html b/content/static/datenspuren/fahrplan/days.de.html similarity index 100% rename from www/datenspuren/fahrplan/days.de.html rename to content/static/datenspuren/fahrplan/days.de.html diff --git a/www/datenspuren/fahrplan/days.en.html b/content/static/datenspuren/fahrplan/days.en.html similarity index 100% rename from www/datenspuren/fahrplan/days.en.html rename to content/static/datenspuren/fahrplan/days.en.html diff --git a/www/datenspuren/fahrplan/events.de.html b/content/static/datenspuren/fahrplan/events.de.html similarity index 100% rename from www/datenspuren/fahrplan/events.de.html rename to content/static/datenspuren/fahrplan/events.de.html diff --git a/www/datenspuren/fahrplan/events.en.html b/content/static/datenspuren/fahrplan/events.en.html similarity index 100% rename from www/datenspuren/fahrplan/events.en.html rename to content/static/datenspuren/fahrplan/events.en.html diff --git a/www/datenspuren/fahrplan/events/1250.de.html b/content/static/datenspuren/fahrplan/events/1250.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1250.de.html rename to content/static/datenspuren/fahrplan/events/1250.de.html diff --git a/www/datenspuren/fahrplan/events/1250.en.html b/content/static/datenspuren/fahrplan/events/1250.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1250.en.html rename to content/static/datenspuren/fahrplan/events/1250.en.html diff --git a/www/datenspuren/fahrplan/events/1251.de.html b/content/static/datenspuren/fahrplan/events/1251.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1251.de.html rename to content/static/datenspuren/fahrplan/events/1251.de.html diff --git a/www/datenspuren/fahrplan/events/1251.en.html b/content/static/datenspuren/fahrplan/events/1251.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1251.en.html rename to content/static/datenspuren/fahrplan/events/1251.en.html diff --git a/www/datenspuren/fahrplan/events/1253.de.html b/content/static/datenspuren/fahrplan/events/1253.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1253.de.html rename to content/static/datenspuren/fahrplan/events/1253.de.html diff --git a/www/datenspuren/fahrplan/events/1253.en.html b/content/static/datenspuren/fahrplan/events/1253.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1253.en.html rename to content/static/datenspuren/fahrplan/events/1253.en.html diff --git a/www/datenspuren/fahrplan/events/1258.de.html b/content/static/datenspuren/fahrplan/events/1258.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1258.de.html rename to content/static/datenspuren/fahrplan/events/1258.de.html diff --git a/www/datenspuren/fahrplan/events/1258.en.html b/content/static/datenspuren/fahrplan/events/1258.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1258.en.html rename to content/static/datenspuren/fahrplan/events/1258.en.html diff --git a/www/datenspuren/fahrplan/events/1259.de.html b/content/static/datenspuren/fahrplan/events/1259.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1259.de.html rename to content/static/datenspuren/fahrplan/events/1259.de.html diff --git a/www/datenspuren/fahrplan/events/1259.en.html b/content/static/datenspuren/fahrplan/events/1259.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1259.en.html rename to content/static/datenspuren/fahrplan/events/1259.en.html diff --git a/www/datenspuren/fahrplan/events/1260.de.html b/content/static/datenspuren/fahrplan/events/1260.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1260.de.html rename to content/static/datenspuren/fahrplan/events/1260.de.html diff --git a/www/datenspuren/fahrplan/events/1260.en.html b/content/static/datenspuren/fahrplan/events/1260.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1260.en.html rename to content/static/datenspuren/fahrplan/events/1260.en.html diff --git a/www/datenspuren/fahrplan/events/1272.de.html b/content/static/datenspuren/fahrplan/events/1272.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1272.de.html rename to content/static/datenspuren/fahrplan/events/1272.de.html diff --git a/www/datenspuren/fahrplan/events/1272.en.html b/content/static/datenspuren/fahrplan/events/1272.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1272.en.html rename to content/static/datenspuren/fahrplan/events/1272.en.html diff --git a/www/datenspuren/fahrplan/events/1273.de.html b/content/static/datenspuren/fahrplan/events/1273.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1273.de.html rename to content/static/datenspuren/fahrplan/events/1273.de.html diff --git a/www/datenspuren/fahrplan/events/1273.en.html b/content/static/datenspuren/fahrplan/events/1273.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1273.en.html rename to content/static/datenspuren/fahrplan/events/1273.en.html diff --git a/www/datenspuren/fahrplan/events/1274.de.html b/content/static/datenspuren/fahrplan/events/1274.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1274.de.html rename to content/static/datenspuren/fahrplan/events/1274.de.html diff --git a/www/datenspuren/fahrplan/events/1274.en.html b/content/static/datenspuren/fahrplan/events/1274.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1274.en.html rename to content/static/datenspuren/fahrplan/events/1274.en.html diff --git a/www/datenspuren/fahrplan/events/1275.de.html b/content/static/datenspuren/fahrplan/events/1275.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1275.de.html rename to content/static/datenspuren/fahrplan/events/1275.de.html diff --git a/www/datenspuren/fahrplan/events/1275.en.html b/content/static/datenspuren/fahrplan/events/1275.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1275.en.html rename to content/static/datenspuren/fahrplan/events/1275.en.html diff --git a/www/datenspuren/fahrplan/events/1277.de.html b/content/static/datenspuren/fahrplan/events/1277.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1277.de.html rename to content/static/datenspuren/fahrplan/events/1277.de.html diff --git a/www/datenspuren/fahrplan/events/1277.en.html b/content/static/datenspuren/fahrplan/events/1277.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1277.en.html rename to content/static/datenspuren/fahrplan/events/1277.en.html diff --git a/www/datenspuren/fahrplan/events/1278.de.html b/content/static/datenspuren/fahrplan/events/1278.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1278.de.html rename to content/static/datenspuren/fahrplan/events/1278.de.html diff --git a/www/datenspuren/fahrplan/events/1278.en.html b/content/static/datenspuren/fahrplan/events/1278.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1278.en.html rename to content/static/datenspuren/fahrplan/events/1278.en.html diff --git a/www/datenspuren/fahrplan/events/1294.de.html b/content/static/datenspuren/fahrplan/events/1294.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1294.de.html rename to content/static/datenspuren/fahrplan/events/1294.de.html diff --git a/www/datenspuren/fahrplan/events/1294.en.html b/content/static/datenspuren/fahrplan/events/1294.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1294.en.html rename to content/static/datenspuren/fahrplan/events/1294.en.html diff --git a/www/datenspuren/fahrplan/events/1299.de.html b/content/static/datenspuren/fahrplan/events/1299.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1299.de.html rename to content/static/datenspuren/fahrplan/events/1299.de.html diff --git a/www/datenspuren/fahrplan/events/1299.en.html b/content/static/datenspuren/fahrplan/events/1299.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1299.en.html rename to content/static/datenspuren/fahrplan/events/1299.en.html diff --git a/www/datenspuren/fahrplan/events/1304.de.html b/content/static/datenspuren/fahrplan/events/1304.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1304.de.html rename to content/static/datenspuren/fahrplan/events/1304.de.html diff --git a/www/datenspuren/fahrplan/events/1304.en.html b/content/static/datenspuren/fahrplan/events/1304.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1304.en.html rename to content/static/datenspuren/fahrplan/events/1304.en.html diff --git a/www/datenspuren/fahrplan/events/1305.de.html b/content/static/datenspuren/fahrplan/events/1305.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1305.de.html rename to content/static/datenspuren/fahrplan/events/1305.de.html diff --git a/www/datenspuren/fahrplan/events/1305.en.html b/content/static/datenspuren/fahrplan/events/1305.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1305.en.html rename to content/static/datenspuren/fahrplan/events/1305.en.html diff --git a/www/datenspuren/fahrplan/events/1306.de.html b/content/static/datenspuren/fahrplan/events/1306.de.html similarity index 100% rename from www/datenspuren/fahrplan/events/1306.de.html rename to content/static/datenspuren/fahrplan/events/1306.de.html diff --git a/www/datenspuren/fahrplan/events/1306.en.html b/content/static/datenspuren/fahrplan/events/1306.en.html similarity index 100% rename from www/datenspuren/fahrplan/events/1306.en.html rename to content/static/datenspuren/fahrplan/events/1306.en.html diff --git a/www/datenspuren/fahrplan/images/conference-128x128.png b/content/static/datenspuren/fahrplan/images/conference-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/conference-128x128.png rename to content/static/datenspuren/fahrplan/images/conference-128x128.png diff --git a/www/datenspuren/fahrplan/images/conference-32x32.png b/content/static/datenspuren/fahrplan/images/conference-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/conference-32x32.png rename to content/static/datenspuren/fahrplan/images/conference-32x32.png diff --git a/www/datenspuren/fahrplan/images/conference-48x48.png b/content/static/datenspuren/fahrplan/images/conference-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/conference-48x48.png rename to content/static/datenspuren/fahrplan/images/conference-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1250-128x128.png b/content/static/datenspuren/fahrplan/images/event-1250-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1250-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1250-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1250-32x32.png b/content/static/datenspuren/fahrplan/images/event-1250-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1250-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1250-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1250-48x48.png b/content/static/datenspuren/fahrplan/images/event-1250-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1250-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1250-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1251-128x128.png b/content/static/datenspuren/fahrplan/images/event-1251-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1251-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1251-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1251-32x32.png b/content/static/datenspuren/fahrplan/images/event-1251-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1251-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1251-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1251-48x48.png b/content/static/datenspuren/fahrplan/images/event-1251-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1251-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1251-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1253-128x128.png b/content/static/datenspuren/fahrplan/images/event-1253-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1253-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1253-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1253-32x32.png b/content/static/datenspuren/fahrplan/images/event-1253-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1253-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1253-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1253-48x48.png b/content/static/datenspuren/fahrplan/images/event-1253-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1253-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1253-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1258-128x128.png b/content/static/datenspuren/fahrplan/images/event-1258-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1258-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1258-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1258-32x32.png b/content/static/datenspuren/fahrplan/images/event-1258-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1258-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1258-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1258-48x48.png b/content/static/datenspuren/fahrplan/images/event-1258-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1258-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1258-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1259-128x128.png b/content/static/datenspuren/fahrplan/images/event-1259-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1259-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1259-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1259-32x32.png b/content/static/datenspuren/fahrplan/images/event-1259-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1259-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1259-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1259-48x48.png b/content/static/datenspuren/fahrplan/images/event-1259-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1259-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1259-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1260-128x128.png b/content/static/datenspuren/fahrplan/images/event-1260-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1260-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1260-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1260-32x32.png b/content/static/datenspuren/fahrplan/images/event-1260-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1260-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1260-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1260-48x48.png b/content/static/datenspuren/fahrplan/images/event-1260-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1260-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1260-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1272-128x128.png b/content/static/datenspuren/fahrplan/images/event-1272-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1272-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1272-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1272-32x32.png b/content/static/datenspuren/fahrplan/images/event-1272-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1272-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1272-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1272-48x48.png b/content/static/datenspuren/fahrplan/images/event-1272-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1272-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1272-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1273-128x128.png b/content/static/datenspuren/fahrplan/images/event-1273-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1273-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1273-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1273-32x32.png b/content/static/datenspuren/fahrplan/images/event-1273-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1273-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1273-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1273-48x48.png b/content/static/datenspuren/fahrplan/images/event-1273-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1273-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1273-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1274-128x128.png b/content/static/datenspuren/fahrplan/images/event-1274-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1274-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1274-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1274-32x32.png b/content/static/datenspuren/fahrplan/images/event-1274-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1274-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1274-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1274-48x48.png b/content/static/datenspuren/fahrplan/images/event-1274-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1274-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1274-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1275-128x128.png b/content/static/datenspuren/fahrplan/images/event-1275-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1275-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1275-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1275-32x32.png b/content/static/datenspuren/fahrplan/images/event-1275-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1275-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1275-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1275-48x48.png b/content/static/datenspuren/fahrplan/images/event-1275-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1275-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1275-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1277-128x128.png b/content/static/datenspuren/fahrplan/images/event-1277-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1277-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1277-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1277-32x32.png b/content/static/datenspuren/fahrplan/images/event-1277-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1277-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1277-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1277-48x48.png b/content/static/datenspuren/fahrplan/images/event-1277-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1277-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1277-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1278-128x128.png b/content/static/datenspuren/fahrplan/images/event-1278-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1278-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1278-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1278-32x32.png b/content/static/datenspuren/fahrplan/images/event-1278-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1278-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1278-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1278-48x48.png b/content/static/datenspuren/fahrplan/images/event-1278-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1278-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1278-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1294-128x128.png b/content/static/datenspuren/fahrplan/images/event-1294-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1294-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1294-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1294-32x32.png b/content/static/datenspuren/fahrplan/images/event-1294-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1294-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1294-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1294-48x48.png b/content/static/datenspuren/fahrplan/images/event-1294-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1294-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1294-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1299-128x128.png b/content/static/datenspuren/fahrplan/images/event-1299-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1299-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1299-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1299-32x32.png b/content/static/datenspuren/fahrplan/images/event-1299-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1299-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1299-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1299-48x48.png b/content/static/datenspuren/fahrplan/images/event-1299-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1299-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1299-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1304-128x128.png b/content/static/datenspuren/fahrplan/images/event-1304-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1304-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1304-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1304-32x32.png b/content/static/datenspuren/fahrplan/images/event-1304-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1304-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1304-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1304-48x48.png b/content/static/datenspuren/fahrplan/images/event-1304-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1304-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1304-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1305-128x128.png b/content/static/datenspuren/fahrplan/images/event-1305-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1305-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1305-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1305-32x32.png b/content/static/datenspuren/fahrplan/images/event-1305-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1305-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1305-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1305-48x48.png b/content/static/datenspuren/fahrplan/images/event-1305-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1305-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1305-48x48.png diff --git a/www/datenspuren/fahrplan/images/event-1306-128x128.png b/content/static/datenspuren/fahrplan/images/event-1306-128x128.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1306-128x128.png rename to content/static/datenspuren/fahrplan/images/event-1306-128x128.png diff --git a/www/datenspuren/fahrplan/images/event-1306-32x32.png b/content/static/datenspuren/fahrplan/images/event-1306-32x32.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1306-32x32.png rename to content/static/datenspuren/fahrplan/images/event-1306-32x32.png diff --git a/www/datenspuren/fahrplan/images/event-1306-48x48.png b/content/static/datenspuren/fahrplan/images/event-1306-48x48.png similarity index 100% rename from www/datenspuren/fahrplan/images/event-1306-48x48.png rename to content/static/datenspuren/fahrplan/images/event-1306-48x48.png diff --git a/www/datenspuren/fahrplan/images/speaker-121-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-121-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-121-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-121-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-121-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-121-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-121-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-121-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-121-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-121-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-121-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-121-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-13-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-13-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-13-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-13-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-13-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-13-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-13-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-13-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-13-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-13-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-13-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-13-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-2-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-2-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-2-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-2-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-2-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-2-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-2-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-2-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-2-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-2-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-2-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-2-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-204-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-204-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-204-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-204-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-204-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-204-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-204-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-204-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-204-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-204-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-204-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-204-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-235-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-235-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-235-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-235-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-235-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-235-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-235-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-235-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-235-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-235-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-235-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-235-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-294-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-294-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-294-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-294-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-294-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-294-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-294-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-294-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-294-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-294-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-294-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-294-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-36-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-36-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-36-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-36-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-36-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-36-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-36-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-36-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-36-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-36-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-36-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-36-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-381-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-381-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-381-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-381-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-381-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-381-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-381-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-381-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-381-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-381-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-381-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-381-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-453-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-453-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-453-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-453-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-453-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-453-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-453-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-453-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-453-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-453-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-453-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-453-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-470-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-470-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-470-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-470-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-470-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-470-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-470-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-470-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-470-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-470-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-470-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-470-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-506-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-506-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-506-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-506-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-506-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-506-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-506-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-506-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-506-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-506-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-506-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-506-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-517-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-517-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-517-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-517-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-517-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-517-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-517-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-517-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-517-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-517-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-517-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-517-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-63-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-63-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-63-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-63-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-63-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-63-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-63-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-63-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-63-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-63-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-63-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-63-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-784-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-784-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-784-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-784-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-784-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-784-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-784-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-784-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-784-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-784-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-784-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-784-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-833-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-833-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-833-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-833-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-833-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-833-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-833-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-833-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-833-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-833-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-833-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-833-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-9-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-9-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-9-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-9-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-9-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-9-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-9-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-9-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-9-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-9-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-9-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-9-48x48.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-913-128x128.jpg b/content/static/datenspuren/fahrplan/images/speaker-913-128x128.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-913-128x128.jpg rename to content/static/datenspuren/fahrplan/images/speaker-913-128x128.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-913-32x32.jpg b/content/static/datenspuren/fahrplan/images/speaker-913-32x32.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-913-32x32.jpg rename to content/static/datenspuren/fahrplan/images/speaker-913-32x32.jpg diff --git a/www/datenspuren/fahrplan/images/speaker-913-48x48.jpg b/content/static/datenspuren/fahrplan/images/speaker-913-48x48.jpg similarity index 100% rename from www/datenspuren/fahrplan/images/speaker-913-48x48.jpg rename to content/static/datenspuren/fahrplan/images/speaker-913-48x48.jpg diff --git a/www/datenspuren/fahrplan/index.de.html b/content/static/datenspuren/fahrplan/index.de.html similarity index 100% rename from www/datenspuren/fahrplan/index.de.html rename to content/static/datenspuren/fahrplan/index.de.html diff --git a/www/datenspuren/fahrplan/index.en.html b/content/static/datenspuren/fahrplan/index.en.html similarity index 100% rename from www/datenspuren/fahrplan/index.en.html rename to content/static/datenspuren/fahrplan/index.en.html diff --git a/www/datenspuren/fahrplan/schedule.de.ics b/content/static/datenspuren/fahrplan/schedule.de.ics similarity index 100% rename from www/datenspuren/fahrplan/schedule.de.ics rename to content/static/datenspuren/fahrplan/schedule.de.ics diff --git a/www/datenspuren/fahrplan/schedule.de.xcs b/content/static/datenspuren/fahrplan/schedule.de.xcs similarity index 100% rename from www/datenspuren/fahrplan/schedule.de.xcs rename to content/static/datenspuren/fahrplan/schedule.de.xcs diff --git a/www/datenspuren/fahrplan/schedule.de.xml b/content/static/datenspuren/fahrplan/schedule.de.xml similarity index 100% rename from www/datenspuren/fahrplan/schedule.de.xml rename to content/static/datenspuren/fahrplan/schedule.de.xml diff --git a/www/datenspuren/fahrplan/schedule.en.ics b/content/static/datenspuren/fahrplan/schedule.en.ics similarity index 100% rename from www/datenspuren/fahrplan/schedule.en.ics rename to content/static/datenspuren/fahrplan/schedule.en.ics diff --git a/www/datenspuren/fahrplan/schedule.en.xcs b/content/static/datenspuren/fahrplan/schedule.en.xcs similarity index 100% rename from www/datenspuren/fahrplan/schedule.en.xcs rename to content/static/datenspuren/fahrplan/schedule.en.xcs diff --git a/www/datenspuren/fahrplan/schedule.en.xml b/content/static/datenspuren/fahrplan/schedule.en.xml similarity index 100% rename from www/datenspuren/fahrplan/schedule.en.xml rename to content/static/datenspuren/fahrplan/schedule.en.xml diff --git a/www/datenspuren/fahrplan/speakers.de.html b/content/static/datenspuren/fahrplan/speakers.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers.de.html rename to content/static/datenspuren/fahrplan/speakers.de.html diff --git a/www/datenspuren/fahrplan/speakers.en.html b/content/static/datenspuren/fahrplan/speakers.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers.en.html rename to content/static/datenspuren/fahrplan/speakers.en.html diff --git a/www/datenspuren/fahrplan/speakers/121.de.html b/content/static/datenspuren/fahrplan/speakers/121.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/121.de.html rename to content/static/datenspuren/fahrplan/speakers/121.de.html diff --git a/www/datenspuren/fahrplan/speakers/121.en.html b/content/static/datenspuren/fahrplan/speakers/121.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/121.en.html rename to content/static/datenspuren/fahrplan/speakers/121.en.html diff --git a/www/datenspuren/fahrplan/speakers/13.de.html b/content/static/datenspuren/fahrplan/speakers/13.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/13.de.html rename to content/static/datenspuren/fahrplan/speakers/13.de.html diff --git a/www/datenspuren/fahrplan/speakers/13.en.html b/content/static/datenspuren/fahrplan/speakers/13.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/13.en.html rename to content/static/datenspuren/fahrplan/speakers/13.en.html diff --git a/www/datenspuren/fahrplan/speakers/2.de.html b/content/static/datenspuren/fahrplan/speakers/2.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/2.de.html rename to content/static/datenspuren/fahrplan/speakers/2.de.html diff --git a/www/datenspuren/fahrplan/speakers/2.en.html b/content/static/datenspuren/fahrplan/speakers/2.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/2.en.html rename to content/static/datenspuren/fahrplan/speakers/2.en.html diff --git a/www/datenspuren/fahrplan/speakers/204.de.html b/content/static/datenspuren/fahrplan/speakers/204.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/204.de.html rename to content/static/datenspuren/fahrplan/speakers/204.de.html diff --git a/www/datenspuren/fahrplan/speakers/204.en.html b/content/static/datenspuren/fahrplan/speakers/204.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/204.en.html rename to content/static/datenspuren/fahrplan/speakers/204.en.html diff --git a/www/datenspuren/fahrplan/speakers/235.de.html b/content/static/datenspuren/fahrplan/speakers/235.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/235.de.html rename to content/static/datenspuren/fahrplan/speakers/235.de.html diff --git a/www/datenspuren/fahrplan/speakers/235.en.html b/content/static/datenspuren/fahrplan/speakers/235.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/235.en.html rename to content/static/datenspuren/fahrplan/speakers/235.en.html diff --git a/www/datenspuren/fahrplan/speakers/294.de.html b/content/static/datenspuren/fahrplan/speakers/294.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/294.de.html rename to content/static/datenspuren/fahrplan/speakers/294.de.html diff --git a/www/datenspuren/fahrplan/speakers/294.en.html b/content/static/datenspuren/fahrplan/speakers/294.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/294.en.html rename to content/static/datenspuren/fahrplan/speakers/294.en.html diff --git a/www/datenspuren/fahrplan/speakers/36.de.html b/content/static/datenspuren/fahrplan/speakers/36.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/36.de.html rename to content/static/datenspuren/fahrplan/speakers/36.de.html diff --git a/www/datenspuren/fahrplan/speakers/36.en.html b/content/static/datenspuren/fahrplan/speakers/36.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/36.en.html rename to content/static/datenspuren/fahrplan/speakers/36.en.html diff --git a/www/datenspuren/fahrplan/speakers/381.de.html b/content/static/datenspuren/fahrplan/speakers/381.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/381.de.html rename to content/static/datenspuren/fahrplan/speakers/381.de.html diff --git a/www/datenspuren/fahrplan/speakers/381.en.html b/content/static/datenspuren/fahrplan/speakers/381.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/381.en.html rename to content/static/datenspuren/fahrplan/speakers/381.en.html diff --git a/www/datenspuren/fahrplan/speakers/453.de.html b/content/static/datenspuren/fahrplan/speakers/453.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/453.de.html rename to content/static/datenspuren/fahrplan/speakers/453.de.html diff --git a/www/datenspuren/fahrplan/speakers/453.en.html b/content/static/datenspuren/fahrplan/speakers/453.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/453.en.html rename to content/static/datenspuren/fahrplan/speakers/453.en.html diff --git a/www/datenspuren/fahrplan/speakers/470.de.html b/content/static/datenspuren/fahrplan/speakers/470.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/470.de.html rename to content/static/datenspuren/fahrplan/speakers/470.de.html diff --git a/www/datenspuren/fahrplan/speakers/470.en.html b/content/static/datenspuren/fahrplan/speakers/470.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/470.en.html rename to content/static/datenspuren/fahrplan/speakers/470.en.html diff --git a/www/datenspuren/fahrplan/speakers/506.de.html b/content/static/datenspuren/fahrplan/speakers/506.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/506.de.html rename to content/static/datenspuren/fahrplan/speakers/506.de.html diff --git a/www/datenspuren/fahrplan/speakers/506.en.html b/content/static/datenspuren/fahrplan/speakers/506.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/506.en.html rename to content/static/datenspuren/fahrplan/speakers/506.en.html diff --git a/www/datenspuren/fahrplan/speakers/517.de.html b/content/static/datenspuren/fahrplan/speakers/517.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/517.de.html rename to content/static/datenspuren/fahrplan/speakers/517.de.html diff --git a/www/datenspuren/fahrplan/speakers/517.en.html b/content/static/datenspuren/fahrplan/speakers/517.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/517.en.html rename to content/static/datenspuren/fahrplan/speakers/517.en.html diff --git a/www/datenspuren/fahrplan/speakers/63.de.html b/content/static/datenspuren/fahrplan/speakers/63.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/63.de.html rename to content/static/datenspuren/fahrplan/speakers/63.de.html diff --git a/www/datenspuren/fahrplan/speakers/63.en.html b/content/static/datenspuren/fahrplan/speakers/63.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/63.en.html rename to content/static/datenspuren/fahrplan/speakers/63.en.html diff --git a/www/datenspuren/fahrplan/speakers/784.de.html b/content/static/datenspuren/fahrplan/speakers/784.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/784.de.html rename to content/static/datenspuren/fahrplan/speakers/784.de.html diff --git a/www/datenspuren/fahrplan/speakers/784.en.html b/content/static/datenspuren/fahrplan/speakers/784.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/784.en.html rename to content/static/datenspuren/fahrplan/speakers/784.en.html diff --git a/www/datenspuren/fahrplan/speakers/833.de.html b/content/static/datenspuren/fahrplan/speakers/833.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/833.de.html rename to content/static/datenspuren/fahrplan/speakers/833.de.html diff --git a/www/datenspuren/fahrplan/speakers/833.en.html b/content/static/datenspuren/fahrplan/speakers/833.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/833.en.html rename to content/static/datenspuren/fahrplan/speakers/833.en.html diff --git a/www/datenspuren/fahrplan/speakers/9.de.html b/content/static/datenspuren/fahrplan/speakers/9.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/9.de.html rename to content/static/datenspuren/fahrplan/speakers/9.de.html diff --git a/www/datenspuren/fahrplan/speakers/9.en.html b/content/static/datenspuren/fahrplan/speakers/9.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/9.en.html rename to content/static/datenspuren/fahrplan/speakers/9.en.html diff --git a/www/datenspuren/fahrplan/speakers/913.de.html b/content/static/datenspuren/fahrplan/speakers/913.de.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/913.de.html rename to content/static/datenspuren/fahrplan/speakers/913.de.html diff --git a/www/datenspuren/fahrplan/speakers/913.en.html b/content/static/datenspuren/fahrplan/speakers/913.en.html similarity index 100% rename from www/datenspuren/fahrplan/speakers/913.en.html rename to content/static/datenspuren/fahrplan/speakers/913.en.html diff --git a/www/datenspuren/fahrplan/stylesheet.css b/content/static/datenspuren/fahrplan/stylesheet.css similarity index 100% rename from www/datenspuren/fahrplan/stylesheet.css rename to content/static/datenspuren/fahrplan/stylesheet.css diff --git a/www/datenspuren/files/PM_Datenspuren.pdf b/content/static/datenspuren/files/PM_Datenspuren.pdf similarity index 100% rename from www/datenspuren/files/PM_Datenspuren.pdf rename to content/static/datenspuren/files/PM_Datenspuren.pdf diff --git a/www/datenspuren/files/datenspuren2006_cfp.pdf b/content/static/datenspuren/files/datenspuren2006_cfp.pdf similarity index 100% rename from www/datenspuren/files/datenspuren2006_cfp.pdf rename to content/static/datenspuren/files/datenspuren2006_cfp.pdf diff --git a/www/datenspuren/images/cc.png b/content/static/datenspuren/images/cc.png similarity index 100% rename from www/datenspuren/images/cc.png rename to content/static/datenspuren/images/cc.png diff --git a/www/datenspuren/images/datenspuren.png b/content/static/datenspuren/images/datenspuren.png similarity index 100% rename from www/datenspuren/images/datenspuren.png rename to content/static/datenspuren/images/datenspuren.png diff --git a/www/datenspuren/images/dsback.png b/content/static/datenspuren/images/dsback.png similarity index 100% rename from www/datenspuren/images/dsback.png rename to content/static/datenspuren/images/dsback.png diff --git a/www/datenspuren/images/dsfront.png b/content/static/datenspuren/images/dsfront.png similarity index 100% rename from www/datenspuren/images/dsfront.png rename to content/static/datenspuren/images/dsfront.png diff --git a/www/datenspuren/images/elbklang.png b/content/static/datenspuren/images/elbklang.png similarity index 100% rename from www/datenspuren/images/elbklang.png rename to content/static/datenspuren/images/elbklang.png diff --git a/www/datenspuren/images/phonocake.png b/content/static/datenspuren/images/phonocake.png similarity index 100% rename from www/datenspuren/images/phonocake.png rename to content/static/datenspuren/images/phonocake.png diff --git a/www/datenspuren/style/style.css b/content/static/datenspuren/style/style.css similarity index 100% rename from www/datenspuren/style/style.css rename to content/static/datenspuren/style/style.css diff --git a/www/images/background.png b/content/static/images/background.png similarity index 100% rename from www/images/background.png rename to content/static/images/background.png diff --git a/www/images/background_bottom.png b/content/static/images/background_bottom.png similarity index 100% rename from www/images/background_bottom.png rename to content/static/images/background_bottom.png diff --git a/www/images/bullet.png b/content/static/images/bullet.png similarity index 100% rename from www/images/bullet.png rename to content/static/images/bullet.png diff --git a/www/images/c3d2_blue.jpg b/content/static/images/c3d2_blue.jpg similarity index 100% rename from www/images/c3d2_blue.jpg rename to content/static/images/c3d2_blue.jpg diff --git a/www/images/ck.png b/content/static/images/ck.png similarity index 100% rename from www/images/ck.png rename to content/static/images/ck.png diff --git a/www/images/logo.png b/content/static/images/logo.png similarity index 100% rename from www/images/logo.png rename to content/static/images/logo.png diff --git a/www/images/pesthoernchen.png b/content/static/images/pesthoernchen.png similarity index 100% rename from www/images/pesthoernchen.png rename to content/static/images/pesthoernchen.png diff --git a/www/images/secure.png b/content/static/images/secure.png similarity index 100% rename from www/images/secure.png rename to content/static/images/secure.png diff --git a/www/images/star.png b/content/static/images/star.png similarity index 100% rename from www/images/star.png rename to content/static/images/star.png diff --git a/www/images/top-left.png b/content/static/images/top-left.png similarity index 100% rename from www/images/top-left.png rename to content/static/images/top-left.png diff --git a/www/images/top-right.png b/content/static/images/top-right.png similarity index 100% rename from www/images/top-right.png rename to content/static/images/top-right.png diff --git a/www/style/default.css b/content/static/style/default.css similarity index 100% rename from www/style/default.css rename to content/static/style/default.css