move app/framework files out of framework/ - rename framework/ to keel/
Merge remote-tracking branch 'bob-remote/rearrangeframework' into keel