refactored Makefile.osx and sources to stay in their own folder