diff --git a/develop_server.sh b/develop_server.sh
index 8c2f27f0ac28b571b8ef9c3703d0aa4de31fa2c4..7d7f4750ab3d1c4266253fdcf0a235bce2af5c19 100755
--- a/develop_server.sh
+++ b/develop_server.sh
@@ -7,7 +7,7 @@ PELICAN=${PELICAN:-pelican}
 PELICANOPTS=
 
 BASEDIR=$(pwd)
-INPUTDIR=$BASEDIR/content
+INPUTDIR=$BASEDIR/
 OUTPUTDIR=$BASEDIR/output
 CONFFILE=$BASEDIR/pelicanconf.py
 
diff --git a/pelicanconf.py b/pelicanconf.py
index 5fd5f39f8919a0c1f03c117a1489d9599e018911..25e10875788d8f06f559642ae196eebd5bd9e00d 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -3,10 +3,12 @@
 from __future__ import unicode_literals
 
 AUTHOR = u'Christoph Gerum, Michael Kuhn'
-SITENAME = u'\xdcbungen Parallele Rechnerarchitektur'
+SITENAME = u'Übungen Parallele Rechnerarchitektur'
 SITEURL = ''
 
-PATH = 'content'
+PAGE_PATHS=['aufgaben', 'pages']
+ARTICLE_PATHS=['news']
+ 
 
 TIMEZONE = 'Europe/Berlin'
 
@@ -20,14 +22,16 @@ AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None
 
 # Blogroll
-LINKS = (('Pelican', 'http://getpelican.com/'),
-         ('Python.org', 'http://python.org/'),
-         ('Jinja2', 'http://jinja.pocoo.org/'),
-         ('You can modify those links in your config file', '#'),)
+LINKS = (('Gem5', 'http://gem5.org'),
+         ('Python', 'https://www.python.org/about/gettingstarted/'),
+         ('C++', 'http://www.cplusplus.com'),
+         ('Ilias', 'https://ovidius.uni-tuebingen.de/ilias3/goto.php?target=crs_992056&client_id=pr02'),
+         ('Forum', 'https://ovidius.uni-tuebingen.de/ilias3/goto.php?target=frm_992065&client_id=pr02'),
+         ('Abgabe', 'https://ovidius.uni-tuebingen.de/ilias3/goto.php?target=grp_1189352&client_id=pr02'),)
 
 # Social widget
-SOCIAL = (('You can add links in your config file', '#'),
-          ('Another social link', '#'),)
+#SOCIAL = (('You can add links in your config file', '#'),
+#          ('Another social link', '#'),)
 
 DEFAULT_PAGINATION = False