Reorganize classes