reorganised project/maven structure