moved ] and , to proper places