[OSX] A LOT of refactoring, need to rename files to align, committing now because I'm afraid to upset git otherwise.
[OSX] Renamed files after big re-factor.