Split some classes out into their own files