restructuring
removing from old structure