moved PAPIBase and made several bug fixes to CMS classes to work properly