Refactor the project. Phase 1: Removal of Utility package.