Adapt canonical module structure