Mid-work commit of experimental code to change over to an object oriented service structure.
Moving classes into class folder.
Had to upgrade git to fix this.
More work on the new service class.  This code is currently in an experimental and broken state.