Regroup files; create target for integration tests
Merge branch 'refactor-make-move'