Split up Utils into 3 files to conform to SRP + refactor