Extracting things into their own files.