Updated Makefile, can now make in src-dir