made feedback mergeable to geonition master
some file renames