Fix Makefile to new paths