Reorganizing for Maven.