Split out Util into multiple modules.