Cleanup and fixing makefiles for modules.