+ Refactoring to fix package structure expected by mvn