Reverted previous 10 commits.

I have reverted David's additions for the moment.  However, my next step
will be to re-add a modified version of David's servlet file.  This will
make managing the servlets easier, while keeping the simplicity of the
core Java classes.