added lots of new modules for trysil demo
removed crap