Fixing problems from the renaming of the Core project and refactoring the dependancies [TFS Changeset #55089]