Adjusted module structure