reorganize packages; redo folding; improve svm testing