Reorganize classes a bit to clarify client