Restructure add mv script