Refactoring maven package.
Package refactoring.