Trying to fix the maven-ization