Refactoring a bit - moving inner classes out to top level classes,
adding more unit tests, finishing up the job configuration