relates to https://issues.redhat.com/browse/DBZ-4028
Also adjusting module directory name for consistency with others.