Minor changes to output printing
Reorganized Makefile.am