More unit test coverage for AutoMove.
Changed project structure.