Refactoring move system.