Redesign module relations more simply