Maven dependencies refactoring WIP