[support] Reorganizing for my classes