diff --git a/src/main/Main.java b/src/main/Main.java
index cfe80ec..2b1798b 100644
--- a/src/main/Main.java
+++ b/src/main/Main.java
@@ -1,6 +1,7 @@
 package main;
 
-import testcase.*;
+import testcase.cactus.*;
+import testcase.youtube.*;
 
 public class Main {
 	static final String token = "ya29.GltyBjRFhtNUq8yk7VF_7IMz2RUmzyW3opMZi4h7oncteCGn4CXSCtnUqZu5wG8jXaV2g9WBmDmtj-3ORqAr-cclO_k4-QMpAfs5NCN9cC_tBJDHsN-uQDKN9WxX";
diff --git a/src/testcase/TestCactus.java b/src/testcase/TestCactus.java
deleted file mode 100644
index 8722b31..0000000
--- a/src/testcase/TestCactus.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package testcase;
-
-abstract public class TestCactus extends TestCase {
-
-	protected TestCactus() {
-		super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts");
-	}
-
-}
diff --git a/src/testcase/TestCreatePOSTCactus.java b/src/testcase/TestCreatePOSTCactus.java
deleted file mode 100644
index d3021cd..0000000
--- a/src/testcase/TestCreatePOSTCactus.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package testcase;
-
-import restfulchecker.*;
-import restfulchecker.RestChecker.Method;
-
-public class TestCreatePOSTCactus extends TestCactus {
-
-	public TestCreatePOSTCactus(String userID, String userName, String userPass) {
-		super();
-		form.add(new RestParam("userID", userID));
-		form.add(new RestParam("userName", userName));
-		form.add(new RestParam("userPass", userPass));
-		check.setupRestTest(Method.POST, query, form, path);
-	}
-
-}
diff --git a/src/testcase/TestDELETECactus.java b/src/testcase/TestDELETECactus.java
deleted file mode 100644
index 2803702..0000000
--- a/src/testcase/TestDELETECactus.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package testcase;
-
-import restfulchecker.RestChecker.Method;
-
-public class TestDELETECactus extends TestCactus {
-
-	public TestDELETECactus(String uniqueID) {
-		super();
-		path.add(uniqueID);
-		check.setupRestTest(Method.DELETE, query, form, path);
-	}
-
-}
diff --git a/src/testcase/TestDELETEYouTube.java b/src/testcase/TestDELETEYouTube.java
deleted file mode 100644
index 795c40a..0000000
--- a/src/testcase/TestDELETEYouTube.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package testcase;
-
-import java.util.ArrayList;
-
-import restfulchecker.RemoveJsonParam;
-import restfulchecker.RestParam;
-import restfulchecker.RestChecker.Method;
-
-public class TestDELETEYouTube extends TestYouTube {
-
-	public TestDELETEYouTube(String token, String id) {
-		super(token);
-		check.getResourceParam().setPathParams("playlists");
-		check.getResourceParam().setQueryParams(new RestParam("mine", "true"));
-		check.getResourceParam().setQueryParams(new RestParam("part", "id"));
-		check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>()));
-		path.add("playlists");
-		query.add(new RestParam("id", id));
-		check.setupRestTest(Method.DELETE, query, form, path);
-	}
-
-}
diff --git a/src/testcase/TestGETCactus.java b/src/testcase/TestGETCactus.java
deleted file mode 100644
index 1ac5aee..0000000
--- a/src/testcase/TestGETCactus.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package testcase;
-
-import restfulchecker.RestChecker.Method;
-
-public class TestGETCactus extends TestCactus {
-
-	public TestGETCactus() {
-		super();
-		check.setupRestTest(Method.GET, query, form, path);
-	}
-
-}
diff --git a/src/testcase/TestGETYouTube.java b/src/testcase/TestGETYouTube.java
deleted file mode 100644
index 9448fb9..0000000
--- a/src/testcase/TestGETYouTube.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package testcase;
-
-import java.util.ArrayList;
-
-import restfulchecker.RemoveJsonParam;
-import restfulchecker.RestParam;
-import restfulchecker.RestChecker.Method;
-
-public class TestGETYouTube extends TestYouTube {
-	public TestGETYouTube(String token) {
-		super(token);
-		query.add(new RestParam("mine", "true"));
-		query.add(new RestParam("part", "id"));
-		path.add("playlists");
-		check.getResourceParam().setQueryParams(new RestParam("mine", "true"));
-		check.getResourceParam().setQueryParams(new RestParam("part", "id"));
-		check.getResourceParam().setPathParams("playlists");
-		check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>()));
-		check.setupRestTest(Method.GET, query, form, path);
-	}
-}
diff --git a/src/testcase/TestLogoutPOSTCactus.java b/src/testcase/TestLogoutPOSTCactus.java
deleted file mode 100644
index 873b805..0000000
--- a/src/testcase/TestLogoutPOSTCactus.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package testcase;
-
-import restfulchecker.*;
-import restfulchecker.RestChecker.Method;
-
-public class TestLogoutPOSTCactus extends TestCactus {
-
-	public TestLogoutPOSTCactus(String token) {
-		super();
-		form.add(new RestParam("token", token));
-		path.add("logout");
-		check.setupRestTest(Method.POST, query, form, path);
-	}
-}
\ No newline at end of file
diff --git a/src/testcase/TestPOSTYouTube.java b/src/testcase/TestPOSTYouTube.java
deleted file mode 100644
index 2cf3dc3..0000000
--- a/src/testcase/TestPOSTYouTube.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package testcase;
-
-import java.util.ArrayList;
-
-import restfulchecker.RemoveJsonParam;
-import restfulchecker.RestParam;
-import restfulchecker.RestChecker.Method;
-
-public class TestPOSTYouTube extends TestYouTube {
-
-	public TestPOSTYouTube(String token) {
-		super(token);
-		check.jsonAcquisition("src/testcase/post.json");
-		check.setProperty("Content-type", "application/json");
-		check.getResourceParam().setPathParams("playlists");
-		check.getResourceParam().setQueryParams(new RestParam("mine", "true"));
-		check.getResourceParam().setQueryParams(new RestParam("part", "id"));
-		check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>()));
-		path.add("playlists");
-		query.add(new RestParam("part", "snippet"));
-		check.setupRestTest(Method.POST, query, form, path);
-	}
-
-}
diff --git a/src/testcase/TestPUTCactus.java b/src/testcase/TestPUTCactus.java
deleted file mode 100644
index 405607c..0000000
--- a/src/testcase/TestPUTCactus.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package testcase;
-
-import java.util.ArrayList;
-
-import restfulchecker.*;
-import restfulchecker.RestChecker.Method;
-
-public class TestPUTCactus extends TestCactus {
-
-	public TestPUTCactus(String userID, String userPass) {
-		super();
-		form.add(new RestParam("userID", userID));
-		form.add(new RestParam("userPass", userPass));
-		check.setupRestTest(Method.PUT, query, form, path);
-		check.setRemoveParam(new RemoveJsonParam("token", new ArrayList<>()));
-	}
-}
diff --git a/src/testcase/TestPUTYouTube.java b/src/testcase/TestPUTYouTube.java
deleted file mode 100644
index f214d3c..0000000
--- a/src/testcase/TestPUTYouTube.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package testcase;
-
-import java.util.ArrayList;
-
-import restfulchecker.RemoveJsonParam;
-import restfulchecker.RestParam;
-import restfulchecker.RestChecker.Method;
-
-public class TestPUTYouTube extends TestYouTube {
-
-	public TestPUTYouTube(String token) {
-		super(token);
-		check.jsonAcquisition("src/testcase/put.json");
-		check.setProperty("Content-type", "application/json");
-		check.getResourceParam().setPathParams("playlists");
-		check.getResourceParam().setQueryParams(new RestParam("mine", "true"));
-		check.getResourceParam().setQueryParams(new RestParam("part", "id"));
-		check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>()));
-		path.add("playlists");
-		query.add(new RestParam("part", "snippet"));
-		check.setupRestTest(Method.PUT, query, form, path);
-	}
-
-}
diff --git a/src/testcase/TestYouTube.java b/src/testcase/TestYouTube.java
deleted file mode 100644
index 8dbb01b..0000000
--- a/src/testcase/TestYouTube.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package testcase;
-
-import restfulchecker.RestParam;
-
-abstract public class TestYouTube extends TestCase {
-
-	protected TestYouTube(String token) {
-		super("https://www.googleapis.com/youtube/v3");
-		query.add(new RestParam("access_token", token));
-		check.getResourceParam().setQueryParams(new RestParam("access_token", token));
-	}
-
-}
diff --git a/src/testcase/cactus/TestCactus.java b/src/testcase/cactus/TestCactus.java
new file mode 100644
index 0000000..366a3c4
--- /dev/null
+++ b/src/testcase/cactus/TestCactus.java
@@ -0,0 +1,11 @@
+package testcase.cactus;
+
+import testcase.TestCase;
+
+abstract public class TestCactus extends TestCase {
+
+	protected TestCactus() {
+		super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts");
+	}
+
+}
diff --git a/src/testcase/cactus/TestCreatePOSTCactus.java b/src/testcase/cactus/TestCreatePOSTCactus.java
new file mode 100644
index 0000000..30b4a7a
--- /dev/null
+++ b/src/testcase/cactus/TestCreatePOSTCactus.java
@@ -0,0 +1,16 @@
+package testcase.cactus;
+
+import restfulchecker.*;
+import restfulchecker.RestChecker.Method;
+
+public class TestCreatePOSTCactus extends TestCactus {
+
+	public TestCreatePOSTCactus(String userID, String userName, String userPass) {
+		super();
+		form.add(new RestParam("userID", userID));
+		form.add(new RestParam("userName", userName));
+		form.add(new RestParam("userPass", userPass));
+		check.setupRestTest(Method.POST, query, form, path);
+	}
+
+}
diff --git a/src/testcase/cactus/TestDELETECactus.java b/src/testcase/cactus/TestDELETECactus.java
new file mode 100644
index 0000000..dfc1d9a
--- /dev/null
+++ b/src/testcase/cactus/TestDELETECactus.java
@@ -0,0 +1,13 @@
+package testcase.cactus;
+
+import restfulchecker.RestChecker.Method;
+
+public class TestDELETECactus extends TestCactus {
+
+	public TestDELETECactus(String uniqueID) {
+		super();
+		path.add(uniqueID);
+		check.setupRestTest(Method.DELETE, query, form, path);
+	}
+
+}
diff --git a/src/testcase/cactus/TestGETCactus.java b/src/testcase/cactus/TestGETCactus.java
new file mode 100644
index 0000000..401cd4b
--- /dev/null
+++ b/src/testcase/cactus/TestGETCactus.java
@@ -0,0 +1,12 @@
+package testcase.cactus;
+
+import restfulchecker.RestChecker.Method;
+
+public class TestGETCactus extends TestCactus {
+
+	public TestGETCactus() {
+		super();
+		check.setupRestTest(Method.GET, query, form, path);
+	}
+
+}
diff --git a/src/testcase/cactus/TestLogoutPOSTCactus.java b/src/testcase/cactus/TestLogoutPOSTCactus.java
new file mode 100644
index 0000000..655b88c
--- /dev/null
+++ b/src/testcase/cactus/TestLogoutPOSTCactus.java
@@ -0,0 +1,14 @@
+package testcase.cactus;
+
+import restfulchecker.*;
+import restfulchecker.RestChecker.Method;
+
+public class TestLogoutPOSTCactus extends TestCactus {
+
+	public TestLogoutPOSTCactus(String token) {
+		super();
+		form.add(new RestParam("token", token));
+		path.add("logout");
+		check.setupRestTest(Method.POST, query, form, path);
+	}
+}
\ No newline at end of file
diff --git a/src/testcase/cactus/TestPUTCactus.java b/src/testcase/cactus/TestPUTCactus.java
new file mode 100644
index 0000000..409128b
--- /dev/null
+++ b/src/testcase/cactus/TestPUTCactus.java
@@ -0,0 +1,17 @@
+package testcase.cactus;
+
+import java.util.ArrayList;
+
+import restfulchecker.*;
+import restfulchecker.RestChecker.Method;
+
+public class TestPUTCactus extends TestCactus {
+
+	public TestPUTCactus(String userID, String userPass) {
+		super();
+		form.add(new RestParam("userID", userID));
+		form.add(new RestParam("userPass", userPass));
+		check.setupRestTest(Method.PUT, query, form, path);
+		check.setRemoveParam(new RemoveJsonParam("token", new ArrayList<>()));
+	}
+}
diff --git a/src/testcase/post.json b/src/testcase/post.json
deleted file mode 100644
index f49d339..0000000
--- a/src/testcase/post.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"snippet": {
-		"title": "aaa",
-		"description": "RestfulChecker`s Test"
-	}
-}
\ No newline at end of file
diff --git a/src/testcase/put.json b/src/testcase/put.json
deleted file mode 100644
index 9e493f1..0000000
--- a/src/testcase/put.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"id": "PLCwNa5MZdBSq_3K5-MV0x6luKXskvqrKk",
-	"snippet": {
-		"title": "eee"
-	}
-}
\ No newline at end of file
diff --git a/src/testcase/youtube/TestDELETEYouTube.java b/src/testcase/youtube/TestDELETEYouTube.java
new file mode 100644
index 0000000..6e4a753
--- /dev/null
+++ b/src/testcase/youtube/TestDELETEYouTube.java
@@ -0,0 +1,22 @@
+package testcase.youtube;
+
+import java.util.ArrayList;
+
+import restfulchecker.RemoveJsonParam;
+import restfulchecker.RestParam;
+import restfulchecker.RestChecker.Method;
+
+public class TestDELETEYouTube extends TestYouTube {
+
+	public TestDELETEYouTube(String token, String id) {
+		super(token);
+		check.getResourceParam().setPathParams("playlists");
+		check.getResourceParam().setQueryParams(new RestParam("mine", "true"));
+		check.getResourceParam().setQueryParams(new RestParam("part", "id"));
+		check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>()));
+		path.add("playlists");
+		query.add(new RestParam("id", id));
+		check.setupRestTest(Method.DELETE, query, form, path);
+	}
+
+}
diff --git a/src/testcase/youtube/TestGETYouTube.java b/src/testcase/youtube/TestGETYouTube.java
new file mode 100644
index 0000000..c9f5662
--- /dev/null
+++ b/src/testcase/youtube/TestGETYouTube.java
@@ -0,0 +1,21 @@
+package testcase.youtube;
+
+import java.util.ArrayList;
+
+import restfulchecker.RemoveJsonParam;
+import restfulchecker.RestParam;
+import restfulchecker.RestChecker.Method;
+
+public class TestGETYouTube extends TestYouTube {
+	public TestGETYouTube(String token) {
+		super(token);
+		query.add(new RestParam("mine", "true"));
+		query.add(new RestParam("part", "id"));
+		path.add("playlists");
+		check.getResourceParam().setQueryParams(new RestParam("mine", "true"));
+		check.getResourceParam().setQueryParams(new RestParam("part", "id"));
+		check.getResourceParam().setPathParams("playlists");
+		check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>()));
+		check.setupRestTest(Method.GET, query, form, path);
+	}
+}
diff --git a/src/testcase/youtube/TestPOSTYouTube.java b/src/testcase/youtube/TestPOSTYouTube.java
new file mode 100644
index 0000000..53963bd
--- /dev/null
+++ b/src/testcase/youtube/TestPOSTYouTube.java
@@ -0,0 +1,24 @@
+package testcase.youtube;
+
+import java.util.ArrayList;
+
+import restfulchecker.RemoveJsonParam;
+import restfulchecker.RestParam;
+import restfulchecker.RestChecker.Method;
+
+public class TestPOSTYouTube extends TestYouTube {
+
+	public TestPOSTYouTube(String token) {
+		super(token);
+		check.jsonAcquisition("src/testcase/post.json");
+		check.setProperty("Content-type", "application/json");
+		check.getResourceParam().setPathParams("playlists");
+		check.getResourceParam().setQueryParams(new RestParam("mine", "true"));
+		check.getResourceParam().setQueryParams(new RestParam("part", "id"));
+		check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>()));
+		path.add("playlists");
+		query.add(new RestParam("part", "snippet"));
+		check.setupRestTest(Method.POST, query, form, path);
+	}
+
+}
diff --git a/src/testcase/youtube/TestPUTYouTube.java b/src/testcase/youtube/TestPUTYouTube.java
new file mode 100644
index 0000000..414781d
--- /dev/null
+++ b/src/testcase/youtube/TestPUTYouTube.java
@@ -0,0 +1,24 @@
+package testcase.youtube;
+
+import java.util.ArrayList;
+
+import restfulchecker.RemoveJsonParam;
+import restfulchecker.RestParam;
+import restfulchecker.RestChecker.Method;
+
+public class TestPUTYouTube extends TestYouTube {
+
+	public TestPUTYouTube(String token) {
+		super(token);
+		check.jsonAcquisition("src/testcase/put.json");
+		check.setProperty("Content-type", "application/json");
+		check.getResourceParam().setPathParams("playlists");
+		check.getResourceParam().setQueryParams(new RestParam("mine", "true"));
+		check.getResourceParam().setQueryParams(new RestParam("part", "id"));
+		check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>()));
+		path.add("playlists");
+		query.add(new RestParam("part", "snippet"));
+		check.setupRestTest(Method.PUT, query, form, path);
+	}
+
+}
diff --git a/src/testcase/youtube/TestYouTube.java b/src/testcase/youtube/TestYouTube.java
new file mode 100644
index 0000000..af0d19d
--- /dev/null
+++ b/src/testcase/youtube/TestYouTube.java
@@ -0,0 +1,14 @@
+package testcase.youtube;
+
+import restfulchecker.RestParam;
+import testcase.TestCase;
+
+abstract public class TestYouTube extends TestCase {
+
+	protected TestYouTube(String token) {
+		super("https://www.googleapis.com/youtube/v3");
+		query.add(new RestParam("access_token", token));
+		check.getResourceParam().setQueryParams(new RestParam("access_token", token));
+	}
+
+}
diff --git a/src/testcase/youtube/post.json b/src/testcase/youtube/post.json
new file mode 100644
index 0000000..f49d339
--- /dev/null
+++ b/src/testcase/youtube/post.json
@@ -0,0 +1,6 @@
+{
+	"snippet": {
+		"title": "aaa",
+		"description": "RestfulChecker`s Test"
+	}
+}
\ No newline at end of file
diff --git a/src/testcase/youtube/put.json b/src/testcase/youtube/put.json
new file mode 100644
index 0000000..9e493f1
--- /dev/null
+++ b/src/testcase/youtube/put.json
@@ -0,0 +1,6 @@
+{
+	"id": "PLCwNa5MZdBSq_3K5-MV0x6luKXskvqrKk",
+	"snippet": {
+		"title": "eee"
+	}
+}
\ No newline at end of file