diff --git a/src/main/java/ArchitectureTest/App.java b/src/main/java/ArchitectureTest/App.java
deleted file mode 100644
index 4e5416b..0000000
--- a/src/main/java/ArchitectureTest/App.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package ArchitectureTest;
-
-import javax.ws.rs.ApplicationPath;
-
-import org.glassfish.jersey.server.ResourceConfig;
-
-@ApplicationPath("/rest")
-public class App extends ResourceConfig {
-
-}
\ No newline at end of file
diff --git a/src/main/java/ArchitectureTest/Companies.java b/src/main/java/ArchitectureTest/Companies.java
deleted file mode 100644
index 9e86f1a..0000000
--- a/src/main/java/ArchitectureTest/Companies.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package ArchitectureTest;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class Companies {
-	static private Companies theInstance = null;
-	private Map<String, Company> companies = new HashMap<>();
-
-	private Companies() {
-
-	}
-
-	static public Companies getInstance() {
-		if (theInstance == null) {
-			theInstance = new Companies();
-		}
-		return theInstance;
-	}
-
-	public Map<String, Company> getCompanies() {
-		return companies;
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/ArchitectureTest/Company.java b/src/main/java/ArchitectureTest/Company.java
deleted file mode 100644
index e84cd91..0000000
--- a/src/main/java/ArchitectureTest/Company.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package ArchitectureTest;
-
-public class Company {
-	private String address;
-
-	Company(String address) {
-		this.setAddress(address);
-	}
-
-	public String getAddress() {
-		return address;
-	}
-
-	public void setAddress(String address) {
-		this.address = address;
-	}
-}
diff --git a/src/main/java/ArchitectureTest/CompanyRest.java b/src/main/java/ArchitectureTest/CompanyRest.java
deleted file mode 100644
index bf0cac0..0000000
--- a/src/main/java/ArchitectureTest/CompanyRest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package ArchitectureTest;
-
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-import net.arnx.jsonic.JSON;
-
-@Path("/companies")
-public class CompanyRest {
-
-	@GET
-	public String getCompanies() {
-		return JSON.encode(Companies.getInstance().getCompanies());
-	}
-
-	@POST
-	public void createCompanies(@FormParam("name") String name, @FormParam("address") String address) {
-		Companies.getInstance().getCompanies().put(name, new Company(address));
-		System.out.println(Companies.getInstance().getCompanies());
-	}
-
-	@Path("/{companyId}/address")
-	@GET
-	public void getAddress(@PathParam("companyId") String company) {
-		Companies.getInstance().getCompanies().get(company).getAddress();
-	}
-
-	@Path("/{companyId}/address")
-	@PUT
-	public void updateAddress(@PathParam("companyId") String company, @FormParam("address") String address) {
-		Companies.getInstance().getCompanies().get(company).setAddress(address);
-	}
-}
diff --git a/src/main/java/ArchitectureTest/Customer.java b/src/main/java/ArchitectureTest/Customer.java
deleted file mode 100644
index b240738..0000000
--- a/src/main/java/ArchitectureTest/Customer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package ArchitectureTest;
-
-import java.net.URI;
-
-public class Customer {
-	private URI companyURI;
-	private String address;
-
-	Customer(String company, String address) {
-		companyURI = URI.create("/companies/" + company);
-		this.address = address;
-	}
-
-	public URI getCompanyURI() {
-		return companyURI;
-	}
-
-	public void setCompanyURI(URI companyURI) {
-		this.companyURI = companyURI;
-	}
-
-	public String getAddress() {
-		return address;
-	}
-
-	public void setAddress(String address) {
-		this.address = address;
-	}
-}
diff --git a/src/main/java/ArchitectureTest/CustomerRest.java b/src/main/java/ArchitectureTest/CustomerRest.java
deleted file mode 100644
index 2b2346b..0000000
--- a/src/main/java/ArchitectureTest/CustomerRest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package ArchitectureTest;
-
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-import net.arnx.jsonic.JSON;
-
-@Path("/customers")
-public class CustomerRest {
-	@GET
-	public String getCustomers() {
-		return JSON.encode(Customers.getInstance().getCustomers());
-	}
-
-	@POST
-	public void createCustomer(@FormParam("name") String name, @FormParam("office") String office,
-			@FormParam("address") String address) {
-		Customers.getInstance().getCustomers().put(name, new Customer(office, address));
-		System.out.println(Customers.getInstance().getCustomers());
-	}
-//
-//	@Path("/{customerId}/office")
-//	@GET
-//	public String getOffice(@PathParam("customerId") String id) {
-//		return Customers.getInstance().getCustomers().get(id).getOffice();
-//	}
-//
-//	@Path("/{customerId}/office")
-//	@PUT
-//	public void updateOffice(@PathParam("customerId") String id, @FormParam("office") String office) {
-//		Customers.getInstance().getCustomers().get(id).setOffice(office);
-//	}
-
-	@Path("/{customerId}/address")
-	@GET
-	public String getAddress(@PathParam("customerId") String id) {
-		return Customers.getInstance().getCustomers().get(id).getAddress();
-	}
-
-	@Path("/{customerId}/address")
-	@PUT
-	public void getAddress(@PathParam("customerId") String id, @FormParam("address") String address) {
-		Customers.getInstance().getCustomers().get(id).setAddress(address);
-	}
-}
diff --git a/src/main/java/ArchitectureTest/Customers.java b/src/main/java/ArchitectureTest/Customers.java
deleted file mode 100644
index 32c8bd2..0000000
--- a/src/main/java/ArchitectureTest/Customers.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package ArchitectureTest;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class Customers {
-	static private Customers theInstance = null;
-	private Map<String, Customer> customers = new HashMap<>();
-
-	private Customers() {
-
-	}
-
-	static public Customers getInstance() {
-		if (theInstance == null) {
-			theInstance = new Customers();
-		}
-		return theInstance;
-	}
-
-	public Map<String, Customer> getCustomers() {
-		return customers;
-	}
-
-}
\ No newline at end of file
diff --git a/src/main/java/ArchitectureTest/Library.java b/src/main/java/ArchitectureTest/Library.java
deleted file mode 100644
index 65fe255..0000000
--- a/src/main/java/ArchitectureTest/Library.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * This Java source file was generated by the Gradle 'init' task.
- */
-package ArchitectureTest;
-
-public class Library {
-    public boolean someLibraryMethod() {
-        return true;
-    }
-}
diff --git a/src/main/java/Proto/A.java b/src/main/java/Proto/A.java
deleted file mode 100644
index 3453fb1..0000000
--- a/src/main/java/Proto/A.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package Proto;
-
-public class A {
-	protected int a;
-
-	public int get() {
-		return a;
-	}
-
-	public void set(int a) {
-		this.a = a;
-	}
-}
diff --git a/src/main/java/Proto/B.java b/src/main/java/Proto/B.java
deleted file mode 100644
index ec8b492..0000000
--- a/src/main/java/Proto/B.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package Proto;
-
-public class B extends A {
-
-}
diff --git a/src/main/java/Proto/C.java b/src/main/java/Proto/C.java
deleted file mode 100644
index b84d714..0000000
--- a/src/main/java/Proto/C.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package Proto;
-
-public class C extends A{
-
-}
diff --git a/src/main/java/Proto/D.java b/src/main/java/Proto/D.java
deleted file mode 100644
index 780f3d8..0000000
--- a/src/main/java/Proto/D.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package Proto;
-
-public class D extends A{
-
-}
diff --git a/src/main/java/architectureTest/App.java b/src/main/java/architectureTest/App.java
new file mode 100644
index 0000000..75a29f5
--- /dev/null
+++ b/src/main/java/architectureTest/App.java
@@ -0,0 +1,10 @@
+package architectureTest;
+
+import javax.ws.rs.ApplicationPath;
+
+import org.glassfish.jersey.server.ResourceConfig;
+
+@ApplicationPath("/rest")
+public class App extends ResourceConfig {
+
+}
\ No newline at end of file
diff --git a/src/main/java/architectureTest/Companies.java b/src/main/java/architectureTest/Companies.java
new file mode 100644
index 0000000..a031b8a
--- /dev/null
+++ b/src/main/java/architectureTest/Companies.java
@@ -0,0 +1,24 @@
+package architectureTest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Companies {
+	static private Companies theInstance = null;
+	private Map<String, Company> companies = new HashMap<>();
+
+	private Companies() {
+
+	}
+
+	static public Companies getInstance() {
+		if (theInstance == null) {
+			theInstance = new Companies();
+		}
+		return theInstance;
+	}
+
+	public Map<String, Company> getCompanies() {
+		return companies;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/architectureTest/Company.java b/src/main/java/architectureTest/Company.java
new file mode 100644
index 0000000..5c68106
--- /dev/null
+++ b/src/main/java/architectureTest/Company.java
@@ -0,0 +1,17 @@
+package architectureTest;
+
+public class Company {
+	private String address;
+
+	Company(String address) {
+		this.setAddress(address);
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+}
diff --git a/src/main/java/architectureTest/CompanyRest.java b/src/main/java/architectureTest/CompanyRest.java
new file mode 100644
index 0000000..7448ea9
--- /dev/null
+++ b/src/main/java/architectureTest/CompanyRest.java
@@ -0,0 +1,37 @@
+package architectureTest;
+
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import net.arnx.jsonic.JSON;
+
+@Path("/companies")
+public class CompanyRest {
+
+	@GET
+	public String getCompanies() {
+		return JSON.encode(Companies.getInstance().getCompanies());
+	}
+
+	@POST
+	public void createCompanies(@FormParam("name") String name, @FormParam("address") String address) {
+		Companies.getInstance().getCompanies().put(name, new Company(address));
+		System.out.println(Companies.getInstance().getCompanies());
+	}
+
+	@Path("/{companyId}/address")
+	@GET
+	public void getAddress(@PathParam("companyId") String company) {
+		Companies.getInstance().getCompanies().get(company).getAddress();
+	}
+
+	@Path("/{companyId}/address")
+	@PUT
+	public void updateAddress(@PathParam("companyId") String company, @FormParam("address") String address) {
+		Companies.getInstance().getCompanies().get(company).setAddress(address);
+	}
+}
diff --git a/src/main/java/architectureTest/Customer.java b/src/main/java/architectureTest/Customer.java
new file mode 100644
index 0000000..a26d14c
--- /dev/null
+++ b/src/main/java/architectureTest/Customer.java
@@ -0,0 +1,29 @@
+package architectureTest;
+
+import java.net.URI;
+
+public class Customer {
+	private URI companyURI;
+	private String address;
+
+	Customer(String company, String address) {
+		companyURI = URI.create("/companies/" + company);
+		this.address = address;
+	}
+
+	public URI getCompanyURI() {
+		return companyURI;
+	}
+
+	public void setCompanyURI(URI companyURI) {
+		this.companyURI = companyURI;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+}
diff --git a/src/main/java/architectureTest/CustomerRest.java b/src/main/java/architectureTest/CustomerRest.java
new file mode 100644
index 0000000..0ea1dbb
--- /dev/null
+++ b/src/main/java/architectureTest/CustomerRest.java
@@ -0,0 +1,49 @@
+package architectureTest;
+
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import net.arnx.jsonic.JSON;
+
+@Path("/customers")
+public class CustomerRest {
+	@GET
+	public String getCustomers() {
+		return JSON.encode(Customers.getInstance().getCustomers());
+	}
+
+	@POST
+	public void createCustomer(@FormParam("name") String name, @FormParam("office") String office,
+			@FormParam("address") String address) {
+		Customers.getInstance().getCustomers().put(name, new Customer(office, address));
+		System.out.println(Customers.getInstance().getCustomers());
+	}
+//
+//	@Path("/{customerId}/office")
+//	@GET
+//	public String getOffice(@PathParam("customerId") String id) {
+//		return Customers.getInstance().getCustomers().get(id).getOffice();
+//	}
+//
+//	@Path("/{customerId}/office")
+//	@PUT
+//	public void updateOffice(@PathParam("customerId") String id, @FormParam("office") String office) {
+//		Customers.getInstance().getCustomers().get(id).setOffice(office);
+//	}
+
+	@Path("/{customerId}/address")
+	@GET
+	public String getAddress(@PathParam("customerId") String id) {
+		return Customers.getInstance().getCustomers().get(id).getAddress();
+	}
+
+	@Path("/{customerId}/address")
+	@PUT
+	public void getAddress(@PathParam("customerId") String id, @FormParam("address") String address) {
+		Customers.getInstance().getCustomers().get(id).setAddress(address);
+	}
+}
diff --git a/src/main/java/architectureTest/Customers.java b/src/main/java/architectureTest/Customers.java
new file mode 100644
index 0000000..d7c6bba
--- /dev/null
+++ b/src/main/java/architectureTest/Customers.java
@@ -0,0 +1,25 @@
+package architectureTest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Customers {
+	static private Customers theInstance = null;
+	private Map<String, Customer> customers = new HashMap<>();
+
+	private Customers() {
+
+	}
+
+	static public Customers getInstance() {
+		if (theInstance == null) {
+			theInstance = new Customers();
+		}
+		return theInstance;
+	}
+
+	public Map<String, Customer> getCustomers() {
+		return customers;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/architectureTest/Library.java b/src/main/java/architectureTest/Library.java
new file mode 100644
index 0000000..f834b8f
--- /dev/null
+++ b/src/main/java/architectureTest/Library.java
@@ -0,0 +1,10 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package architectureTest;
+
+public class Library {
+    public boolean someLibraryMethod() {
+        return true;
+    }
+}
diff --git a/src/main/java/proto/A.java b/src/main/java/proto/A.java
new file mode 100644
index 0000000..8ddcccb
--- /dev/null
+++ b/src/main/java/proto/A.java
@@ -0,0 +1,17 @@
+package proto;
+
+public class A {
+	protected int a;
+
+	public A(int a) {
+		this.a = a;
+	}
+
+	public int get() {
+		return a;
+	}
+
+	public void set(int a) {
+		this.a = a;
+	}
+}
diff --git a/src/main/java/proto/B.java b/src/main/java/proto/B.java
new file mode 100644
index 0000000..079b7d8
--- /dev/null
+++ b/src/main/java/proto/B.java
@@ -0,0 +1,10 @@
+package proto;
+
+public class B extends A {
+
+	public B(int a) {
+		super(a);
+		// TODO 自動生成されたコンストラクター・スタブ
+	}
+
+}
diff --git a/src/main/java/proto/C.java b/src/main/java/proto/C.java
new file mode 100644
index 0000000..c27ee5e
--- /dev/null
+++ b/src/main/java/proto/C.java
@@ -0,0 +1,10 @@
+package proto;
+
+public class C extends A{
+
+	public C(int a) {
+		super(a);
+		// TODO 自動生成されたコンストラクター・スタブ
+	}
+
+}
diff --git a/src/main/java/proto/D.java b/src/main/java/proto/D.java
new file mode 100644
index 0000000..2a5578c
--- /dev/null
+++ b/src/main/java/proto/D.java
@@ -0,0 +1,10 @@
+package proto;
+
+public class D extends A{
+
+	public D(int a) {
+		super(a);
+		// TODO 自動生成されたコンストラクター・スタブ
+	}
+
+}
diff --git a/src/main/java/proto/Main.java b/src/main/java/proto/Main.java
new file mode 100644
index 0000000..9123742
--- /dev/null
+++ b/src/main/java/proto/Main.java
@@ -0,0 +1,12 @@
+package proto;
+
+public class Main {
+
+	public static void main(String[] args) {
+		A ins[] = { new A(10), new B(5), new C(7), new D(8) };
+		for(int i=0;i<4;i++) {
+			System.out.println(ins[i]);
+		}
+	}
+
+}
diff --git a/src/test/java/ArchitectureTest/LibraryTest.java b/src/test/java/ArchitectureTest/LibraryTest.java
index 60421ad..d639214 100644
--- a/src/test/java/ArchitectureTest/LibraryTest.java
+++ b/src/test/java/ArchitectureTest/LibraryTest.java
@@ -4,6 +4,9 @@
 package ArchitectureTest;
 
 import org.junit.Test;
+
+import architectureTest.Library;
+
 import static org.junit.Assert.*;
 
 public class LibraryTest {