refactor Entity:move + Puff:move