MP1-4155: (not compilable) splitting demuxers into more logical parts