moved into right structure