Renamed and added classifiers.