Small reorganization of utils/ folder contents
31 files changed