Moves classes into their own files in preperation for more unit tests and expansion of extractor