Minor refacto
Fix project not compiling with maven...