moving folders based on new structure