* JAVA-6474/JAVA-6324: Align module names, folder names and artifact id (template) * JAVA-6474/JAVA-6324: revert changes for guest modules