Index: WebContent/WEB-INF/conf/unicorn.properties.default
===================================================================
--- WebContent/WEB-INF/conf/unicorn.properties.default	(revision 1198:b76dd8f6e1eb)
+++ WebContent/WEB-INF/conf/unicorn.properties.default	(revision 1208:9d8665f5b155)
@@ -1,3 +1,3 @@
-# UNICORN_HOME is a property set in the jvm parameters (ex: -Dunicorn.home="/var/lib/tomcat6/webapps/unicorn/"). Read the README file for more info. 
+# UNICORN_HOME is the path to Unicorn directory as guessed by Unicorn
 UNICORN_URL = http://localhost:8080/unicorn/
 
@@ -18,12 +18,10 @@
 OBSERVER_READ_TIMEOUT = 0
 
+PATH_TO_LANGUAGE_FILES = ${UNICORN_HOME}/WEB-INF/languages/
+PATH_TO_TASK_LANGUAGE_FILES = ${PATH_TO_LANGUAGE_FILES}/WEB-INF/tasks/
 PATH_TO_RESOURCES = ${UNICORN_HOME}/WEB-INF/resources/
-PATH_TO_OBSERVER_LIST = ${PATH_TO_RESOURCES}
 PATH_TO_TASKLIST = ${PATH_TO_RESOURCES}/tasklist/
 PATH_TO_TEMPLATES = ${PATH_TO_RESOURCES}/templates/
-PATH_TO_CACHE = ${UNICORN_HOME}/WEB-INF/cache/
-PATH_TO_CONF_FILES = ${UNICORN_HOME}/WEB-INF/conf/
-PATH_TO_LANGUAGE_FILES = ${UNICORN_HOME}/WEB-INF/languages/
-PATH_TO_TASK_LANGUAGE_FILES = ${PATH_TO_LANGUAGE_FILES}/tasks/
+
 PATH_TO_TEMPORARY_FILES = ${UNICORN_HOME}/temporary_files/
 URL_TO_TEMPORARY_FILES = ${UNICORN_URL}/temporary_files/
@@ -32,6 +30,4 @@
 DELETE_UPLOADED_FILES = true
 
-OBSERVER_LIST_FILE = ${PATH_TO_CONF_FILES}/observers.list
-OBSERVER_RDF_MODEL = ${PATH_TO_RESOURCES}/schemas/Observer.rdfs
-OBSERVER_XML_FILENAME = observer.wadl
-OBSERVER_RDF_FILENAME = observer.rdf
+OBSERVER_LIST_FILE = observers.properties
+OBSERVER_DEFAULT_FILENAME = observer.wadl