Issue #1 - the utils project is refactored here.