Rearranging a bit, splitting out maven projects.