added move configuration
refactoring WIP