Massive Refactoring
Major refactoring and change of the group and artifact