Re-organized makefiles
(1) Simplified output for quoted stuff
(2) Better parsing of module names and filenames for modules