Started part 2.

Moved the webserver 1 out of a package, and also made connection an
inner class.