[ots] Shuffle code around
1 file changed