fix Makefile.am and configure.ac to match directory renaming