Initial pass with cpp files.
astyle pass.
Remove .orig
Merge pull request #1 from RichardGale/with_cpp

With cpp