Moved the files back into the root directory again..
Modified Makefile.am and configure.ac to find the moved files..