refactor Maven structure to help with mvn release