Reorganize my classes