Updated module structure