Moved to better categorization, more convenience methods, contextual method names, iOS compilation flags for iOS only content.
Convenience methods

refactor
Merged with master