Maven projects refactoring

Change-Id: I67b25c5830b720f6c737d76d62bfa34ba65f8a91