Modified Maven structure, and updated POM's