Changed packaging made comments godoc friendly.