REFACTORING - move_and_merge done
REFACTORING - main file done, adjusting tests now.