Fix git structure and all references to FM
Add base object model

This commit also contains fixes from the pull request such as using
strong instead of copy for properties and adding a nil JSON test.