Extracting stuff out into a bunch of new files.