Fix creation of extraneous directories in Makefile

Also fix the clean target to remove all generated files