Refactorizing Shared project