restructure
Merge branch 'master' of github.com:peteb/FunctionalKit