More reduction.

- Use URI exclusively.
- Get rid of some legacy cruft.
- Assume a hard coded timeout value of 10.
Rename, cleanup, and soveranize the hell out of code.
Whitespace removal.