Money move cmd & some restructuring