Restructured the project files using FileTruck.
Fixed the unit tests - the JSONModel submodule has
introduced a UNIT_TESTING preprocessor macro that
needs to be added to unit test targets.
Merge pull request #208 from ChrisGrant/master

Fixed tests.