refactoring move units