Restructured utils' packages.