Restructured pom after removal of instrumentation.