Refactoring util project