changed metadata ordering

in the process, simplified classifiers handling - sorry @cdent, it just
hurt my eyes too much...