Separated logic in multiple files via includes
Initial Mac OS X support