Correct Makefiles

Correct makefiles for new location