Rework the java packages so that if the repository name and the data module name match then the last package part is elided by default