Revert the self organizing code. Will introduce a config-based automatic classification scheme.