move and improve util scripts