refactoring. Not a big deal but I don't like to have files called something-utils...