PS-2 #comment Reorganization of pom files