- fix makefiles to suit new dir layout