Changing structure of data- and versionfiles
Merge branch 'master' into gh-pages