Reorganize project into individual class files