Flattened source and improved makefile.