Refractored it to the maven.core package