Updated module structure.