Update makefiles to use new directory structure