Moved OSX-specific headers into respective folder.
Cleanup.