Revert "Removed "-" from module folders due to incompatibility with maven-release"

This reverts commit 26052e73fa3d0e14dd89f4cfeacf456c3a7b2f83.