Changed organization of servlets, fixed some old headers.