Reorganize classes into new files