Tidy up makefile dependencies and module name