Reorganized module structure