Refactor Utilities -> Util & update JavaDocs