Issue #234 Use organization-module instead organization/module