finish basic Move Out refactoring #140