Use module directories named after artifactId

Change-Id: I1f4fe9d884ebbca589009fb1612cbe03d395b184