retain in the new component infrastructure. Clean Makefile.am to fix "make distcheck". Update the gitignore rules.