Refactoring some files into a util package