Fixing makefiles for new module paths