Refactoring move.lua;