HEAVY refactoring. complying with Maven conventions.
HEAVY refactoring. Complying with Maven conventions