Handle Makefiles that change directory
Refactored module names