The location for the cgi class has moved to here.