update Makefile for directory renames