initial revision
moved some framework files around
Merge pull request #1 from mjeverson/mjeverson/dev

Mjeverson/dev