Code re-org and small fix in feature selection in classification