More refactors. Tried a little of servlets.