Refactorings to match Sonatypes repo convention