Revert "mavenize"

This reverts commit 6a0a34012d297032621af87b9f489e12c1216def.
Revert "Revert "mavenize""

This reverts commit e64c5f42b7be47f47d27eaaea261f150fb79416d.