Cleanup xcodeproj file
Cleanup code and make API more abstract