APIGW-681: Refactor maven structure