Reorganize classes in preparation for splitting the project