Refactoring + changed dependencies to Maven dependencies.