Licence change, code cleaning, updated pom.xml