[Fix] Really fix module auto-loading layout