Merging in the server refactorin

[James M Snell]

If there are no objections, I would like to merge the refactored server 
code into trunk a bit later today.

- James