And fix the maven project