Modified the all module structure