Fix silly operator bug, split files (breaks client ftm)