Moving a few files around due to introduction of Spring and wiring that allows better control of packaging and scoping.