fixup! move and improve util scripts