split classes out