[keycloak-dev] starting on module re-org after Stian's commit