Tons of changes for sake of splitting and using parent pom