Refactoring + modified pom.xml so that plugin works with standalone jar