move headers to subdirectory, reference by relative path from test project.  delete UHCore merged file from test and UHCore projects.  remove old base.cpp/h files.