refactor filetree

the refactor of master and merge master>gh-pages seems to have failed
somewhere