Removed useless files
Fixed iOS tests
Minor refactoring
Add object data source
Fixes OSX project
Minor refactoring