[queso]: removing uq_ file name
[queso]: changing makefile.am file paths
[queso]: rebuilding makefile.am to include new header files