Shift to new file, where it makes more sense