Organizational updates to code.  Removal of duplicate headers.  

...ct.  delete UHCore merged file from test and UHCore projects.  remove old base.cpp/h files.