refactor config movements