one more round of fixes and cleanup
-rw-r--r-- 16420 Makefile
drwxr-xr-x - doc
drwxr-xr-x - src
drwxr-xr-x - upstream