Pull function creation out of the request.
And more unification of style.
reorg some more.
Merge branch 'master' of github.com:bjornstar/FrameworkBenchmarks into bjornstar-master