Roto: also support the general context
Xcode: organize