diff --git a/src/main/java/com/example/cosmos_serversb/entities/Password.java b/src/main/java/com/example/cosmos_serversb/entities/Password.java
new file mode 100644
index 0000000..b98b679
--- /dev/null
+++ b/src/main/java/com/example/cosmos_serversb/entities/Password.java
@@ -0,0 +1,29 @@
+package com.example.cosmos_serversb.entities;
+
+public class Password {
+    public String pw,uId;
+    public Password(){
+
+    }
+
+    public Password(String pw,String uId){
+        setPw(pw);
+        setUId(uId);
+    }
+
+    public void setUId(String uId) {
+        this.uId = uId;
+    }
+
+    public String getUId() {
+        return uId;
+    }
+
+    public void setPw(String pw) {
+        this.pw = pw;
+    }
+
+    public String getPw() {
+        return pw;
+    }
+}
diff --git a/src/main/java/com/example/cosmos_serversb/entities/Token.java b/src/main/java/com/example/cosmos_serversb/entities/Token.java
index 7b6cabb..dc6d4e7 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/Token.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/Token.java
@@ -1,8 +1,29 @@
 package com.example.cosmos_serversb.entities;
 
 public class Token {
-    public String token;
-    public Token(String token){
-        this.token =token;
+    public String token,uId;
+    public Token(){
+
+    }
+
+    public Token(String token,String uId){
+        setToken(token);
+        setUid(uId);
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setUid(String uId) {
+        this.uId = uId;
+    }
+
+    public String getUid() {
+        return uId;
     }
 }
diff --git a/src/main/java/com/example/cosmos_serversb/entities/User.java b/src/main/java/com/example/cosmos_serversb/entities/User.java
index df441c7..efefb2c 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/User.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/User.java
@@ -1,25 +1,26 @@
 package com.example.cosmos_serversb.entities;
 
 public class User {
-    public String uId, uri, name, pw, iconUri;
+    public String uId, uri, name, iconUri;
     public boolean login = true;
 
-    public  User(){
+    public User() {
 
     }
 
 
-    public User(String name, String uId, String uri, String pw, String iconUri) {
+    public User(String name, String uId, String uri, String iconUri) {
         setuId(uId);
         setUri(uri);
         setName(name);
-        setPw(pw);
         setIconUri(iconUri);
+        this.login = true;
     }
 
     public String getuId() {
         return uId;
     }
+
     public void setuId(String uId) {
         this.uId = uId;
     }
@@ -27,30 +28,31 @@
     public String getUri() {
         return uri;
     }
+
     public void setUri(String uri) {
         this.uri = uri;
     }
+
     public String getName() {
         return name;
     }
+
     public void setName(String name) {
         this.name = name;
     }
-    public String getPw() {
-        return pw;
-    }
-    public void setPw(String pw) {
-        this.pw = pw;
-    }
+
     public String getIconUri() {
         return iconUri;
     }
+
     public void setIconUri(String iconUri) {
         this.iconUri = iconUri;
     }
+
     public boolean getLogin() {
         return login;
     }
+
     public void setLogin(boolean login) {
         this.login = login;
     }
diff --git a/src/main/java/com/example/cosmos_serversb/models/Users.java b/src/main/java/com/example/cosmos_serversb/models/Users.java
index 601de78..356cb06 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Users.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Users.java
@@ -10,7 +10,6 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.criterion.Restrictions;
 
 @Singleton
 public class Users {
@@ -70,17 +69,16 @@
         Session session = sessionFactory.openSession();
         session.beginTransaction();
         //名前、uId、ユーザーuri、パスワード、アイコンイメージを保存
-        User testUser = new User(name,getInstance().createUId(), "http://nitta-lab-8080/cosmos/users/{uId}.com",pw,iconImage);
+        User testUser = new User(name,getInstance().createUId(), "http://nitta-lab-8080/cosmos/users/{uId}.com",iconImage);
         session.save(testUser);
         //出力
-        List userResult = session.createQuery( "from User" ).list();
-        for ( User user : (List<User>) userResult ) {
-            System.out.println( "UserId (" + user.getuId() + ") : " + user.getUri() + ": " + user.getName());
-        }
+//        List userResult = session.createQuery( "from User" ).list();
+//        for ( User user : (List<User>) userResult ) {
+//            System.out.println( "UserId (" + user.getuId() + ") : " + user.getUri() + ": " + user.getName());
+//       }
         session.getTransaction().commit();
         session.close();
-
-//        testUser.token.add(getInstance().createToken(testUser.uId));
+////        testUser.token.add(getInstance().createToken(testUser.uId));
 //        testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
     }
@@ -92,9 +90,7 @@
         List usertList = session.createQuery( "from User" ).list();
         for ( User user : (List<User>) usertList ) {
             if(user.getuId() == uId){
-                user.setuId(uId);
                 user.setName(name);
-                user.setPw(pw);
                 if(iconImage != null) {
                     user.setIconUri(iconImage);
                 }
@@ -104,7 +100,6 @@
         }
         session.getTransaction().commit();
         session.close();
-
 //        testUser.token.add(getInstance().createToken(testUser.uId));
 //        testUser.token.add(getInstance().createToken(testUser.uId));
         return null;
@@ -115,7 +110,7 @@
 
         Session session = sessionFactory.openSession();
         session.beginTransaction();
-        List usertList = session.createQuery( "from User" ).list();
+        List usertList = session.createQuery( "from getUser" ).list();
         for ( User user : (List<User>) usertList ) {
             if (user.getuId() == uId) {
                 System.out.println( "name: " + user.getName() + "iconUri : " + user.getIconUri());
@@ -124,7 +119,6 @@
         }
         session.getTransaction().commit();
         session.close();
-
 //        testUser.token.add(getInstance().createToken(testUser.uId));
 //        testUser.token.add(getInstance().createToken(testUser.uId));
         return null;
@@ -132,7 +126,7 @@
 
     public static User getUserByToken(String token) {
         //与えられたTokenに紐づくUser情報を返す
-        User testUser = new User("test",  getInstance().createUId(), "http://nitta-lab-8080/cosmos/users/{uId}.com", "testpw", "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
+        User testUser = new User("test",  getInstance().createUId(), "http://test.com", "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
 //        testUser.token.add(getInstance().createToken(testUser.uId));
 //        testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
diff --git a/src/main/java/com/example/cosmos_serversb/models/UsersMain.java b/src/main/java/com/example/cosmos_serversb/models/UsersMain.java
index 1b538b7..375ae66 100644
--- a/src/main/java/com/example/cosmos_serversb/models/UsersMain.java
+++ b/src/main/java/com/example/cosmos_serversb/models/UsersMain.java
@@ -5,10 +5,8 @@
     public static void main(String args[]){
         Users.setUp();
         Users.createUser("test1","test1","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
-        Users.createUser("test2","test2","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
-        Users.getUserById("1234");
         Users.setUser("1234","test3","test3","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
-        Users.getUserById("testId");
+        Users.getUserById("1234");
         Users.tearDown();
     }
 }
diff --git a/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java b/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java
index 8c2ed74..27a3ae6 100644
--- a/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java
+++ b/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java
@@ -22,7 +22,7 @@
 
         return json;
     }
-
+    
     @Path("/{uId}")
     @GET
     public String getUsersInfo(
diff --git a/src/main/resources/Password.hbm.xml b/src/main/resources/Password.hbm.xml
new file mode 100644
index 0000000..9ce3f87
--- /dev/null
+++ b/src/main/resources/Password.hbm.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+  ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="com.example.cosmos_serversb.entities">
+
+    <class name="Password" table="PW">
+        <id name="uId" column="UID">
+        </id>
+        <property name="pw" column="PW"/>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/src/main/resources/Token.hbm.xml b/src/main/resources/Token.hbm.xml
new file mode 100644
index 0000000..72bf3d8
--- /dev/null
+++ b/src/main/resources/Token.hbm.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+  ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="com.example.cosmos_serversb.entities">
+
+    <class name="Token" table="TOKEN">
+        <id name="token" column="TOKEN">
+        </id>
+        <property name="uId" column="UID"/>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/src/main/resources/User.hbm.xml b/src/main/resources/User.hbm.xml
index 678506a..967e4d9 100644
--- a/src/main/resources/User.hbm.xml
+++ b/src/main/resources/User.hbm.xml
@@ -17,7 +17,6 @@
         </id>
         <property name="name" column="NAME"/>
         <property name="uri" column="URI"/>
-        <property name="pw" column="PW"/>
         <property name="iconUri" column="ICONURI"/>
         <property name="login" column="LOGIN"/>
     </class>
diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
index f7d98b7..7d65dce 100644
--- a/src/main/resources/hibernate.cfg.xml
+++ b/src/main/resources/hibernate.cfg.xml
@@ -37,7 +37,9 @@
         <mapping resource="User.hbm.xml"/>
         <mapping resource="Group.hbm.xml"/>
         <mapping resource="Request.hbm.xml"/>
-
+        <mapping resource="User.hbm.xml"/>
+        <mapping resource="Token.hbm.xml"/>
+        <mapping resource="Password.hbm.xml"/>
     </session-factory>
 
 </hibernate-configuration>
\ No newline at end of file