Upgrade to maven-config release 6

- Clean up project