refactoring blueprintCatalog and mixinCatalog to use Dictionary.  Updated unit tests