Move more types to the security package.  Various doc cleanups.