Classification is a module now (from upstream)