adopt servlet new strcture