Put shuttle related implementations under "shuttle"