1. Consolidated libraries bootstrap files to the CMS bootstrap.
2.Removed more file location inconsistencies.