reorganized, added OSXey package to Makefile