moved servlet, updated XML