from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPClient.java"
   contains "import org.apache.yoko.util.Cache;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/OB/ORBInstance.java"
   contains "import org.apache.yoko.util.Cache;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/OB/ValueWriter.java"
   contains "import org.apache.yoko.util.cmsf.RepIds;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java"
   contains "import org.apache.yoko.util.cmsf.RepIds;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/OB/Upcall.java"
   contains "import org.apache.yoko.util.cmsf.CmsfThreadLocal;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/OB/ValueFactoryManager.java"
   contains "import org.apache.yoko.util.cmsf.RepIds;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/yasf/YasfHelper.java"
   contains "import org.apache.yoko.util.yasf.Yasf;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/yasf/YasfClientInterceptor.java"
   contains "import org.apache.yoko.util.yasf.Yasf;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/yasf/YasfIORInterceptor.java"
   contains "import org.apache.yoko.util.yasf.Yasf;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/yasf/YasfServerInterceptor.java"
   contains "import org.apache.yoko.util.yasf.Yasf;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/PortableInterceptor/ServerRequestInfo_impl.java"
   contains "import org.apache.yoko.util.yasf.YasfThreadLocal;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/PortableInterceptor/ClientRequestInfo_impl.java"
   contains "import org.apache.yoko.util.yasf.YasfThreadLocal;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/cmsf/CmsfClientInterceptor.java"
   contains "import org.apache.yoko.util.cmsf.CmsfThreadLocal;"

from: yoko-core
to: yoko-util
evidence:
 - file: "yoko-core/src/main/java/org/apache/yoko/orb/cmsf/CmsfServerInterceptor.java"
   contains "import org.apache.yoko.util.cmsf.CmsfThreadLocal;"