Break classes out into their own files