Changing pom structure to a simpler model.