Update Makefile

better folder names, optimized for osx