Moved handlers into server package.

Also fixed two small naming errors that sneeked in.