Maven structure - closes issue #1