Refactoring of package structure to fit mvn default