diff --git a/src/main/java/teetime/framework/pipe/PipeFactoryLoader.java b/src/main/java/teetime/framework/pipe/PipeFactoryLoader.java
index e58d60083aa7f4c2eb4f00de7a79c552df5b56bb..6fcbda81d8ff073ca27a9d2863b4ec02ad6f4688 100644
--- a/src/main/java/teetime/framework/pipe/PipeFactoryLoader.java
+++ b/src/main/java/teetime/framework/pipe/PipeFactoryLoader.java
@@ -12,7 +12,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import teetime.framework.FileSearcher;
+import teetime.util.classpath.FileSearcher;
 
 public final class PipeFactoryLoader {
 
diff --git a/src/main/java/teetime/framework/FileSearcher.java b/src/main/java/teetime/util/classpath/FileSearcher.java
similarity index 95%
rename from src/main/java/teetime/framework/FileSearcher.java
rename to src/main/java/teetime/util/classpath/FileSearcher.java
index 5902ba89fd2b954f4106d4277ad7dec62b54577d..7476a9b2101a1ec36e8c28dabaa73678925dd24c 100644
--- a/src/main/java/teetime/framework/FileSearcher.java
+++ b/src/main/java/teetime/util/classpath/FileSearcher.java
@@ -1,4 +1,4 @@
-package teetime.framework;
+package teetime.util.classpath;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/src/test/java/teetime/framework/FileSearcherTest.java b/src/test/java/teetime/util/classpath/FileSearcherTest.java
similarity index 90%
rename from src/test/java/teetime/framework/FileSearcherTest.java
rename to src/test/java/teetime/util/classpath/FileSearcherTest.java
index 0b7085b4ee7ee557ebf139769b4a2b6e60216ee2..44ca4ad7dac3d2bf7bcde24825b2cd3d91838f8e 100644
--- a/src/test/java/teetime/framework/FileSearcherTest.java
+++ b/src/test/java/teetime/util/classpath/FileSearcherTest.java
@@ -1,4 +1,4 @@
-package teetime.framework;
+package teetime.util.classpath;
 
 import java.io.IOException;
 import java.net.URL;
@@ -7,6 +7,8 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 
+import teetime.util.classpath.FileSearcher;
+
 public class FileSearcherTest {
 
 	public FileSearcherTest() {}