Organise, mavenise, update to 1.7.10