Could be. I had some common routines I was using between different plugins before I started using maven shading to stick to DRY with a single common library.

I appreciate the PR, nice to have some help with the project. A lot of HSP was refactored for 2.0 in the 'modules' branch and I have done very little with the 1.7 branch since. I'd hate for you to spend lots of time refactoring 1.7 only for it to be similar to 2.0. On the other hand, 2.0 is a major overhaul including the use of IoC, so if you prefer to contribute to the 1.7 branch being more maintainable, no complaints here!