CGI should be a class, not a module.  Fix #1