Merge "Startup arch - remove artifactId prefix from dir names."