Moved stuff in servlet package.