Reverting maven standard directory layout
Merge branch 'maven-central-prep'