Update standalone

[vbtrek]

The standalone project is new and should reuse as much of the AutoMerge project code as possible. Can you refactor the code to reuse where possible, and change classes to public if required in AutoMerge.

[vbtrek]

Create a pull request with any changes