Refactoring

I have worked through most of the refactoring so far.  There are some TODO's left as well as completion of the maven integration that will wait until a review of the structure is good to go.  Let me know if you get a chance to look at this and pull it it.

Thanks,
Nick