Changed the Makefile.am to find the moved sourcecode, and cleaned up the configure.ac a little.