Reorganize & update SLDA and variants