Moved Freemarker config to a singleton
updated database and areas, incomplete