+ Refactoring to fit mvn default structure