diff --git a/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt b/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt
index 958d79c..391e4b7 100644
--- a/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt
+++ b/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt
@@ -19,7 +19,7 @@
  */
 class HistoryFragment : Fragment() {
     lateinit var binding: FragmentHistoryBinding
-    val historyViewModel by lazy { ViewModelProviders.of(this, HistoryViewModel.Factory(adapter)).get(HistoryViewModel::class.java) }
+    val historyViewModel by lazy { ViewModelProviders.of(this, jackall.moncalc.viewmodel.HistoryViewModel.Factory(adapter)).get(jackall.moncalc.viewmodel.HistoryViewModel::class.java) }
     val adapter by lazy { HistoryRecyclerAdapter(activity) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/kotlin/jackall/moncalc/fragment/HistoryViewModel.kt b/app/src/main/kotlin/jackall/moncalc/fragment/HistoryViewModel.kt
deleted file mode 100644
index 81a0bba..0000000
--- a/app/src/main/kotlin/jackall/moncalc/fragment/HistoryViewModel.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package jackall.moncalc.fragment
-
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
-import android.databinding.ObservableBoolean
-import jackall.moncalc.adapter.HistoryRecyclerAdapter
-import jackall.moncalc.db.MonstDataRealmHelper
-import jackall.moncalc.db.QuestRecordRealmHelper
-import jackall.moncalc.viewmodel.LifecycleViewModel
-import jackall.moncalc.vo.Fruit
-import jackall.moncalc.vo.Grade
-import jackall.moncalc.vo.HistoryItem
-import jackall.moncalc.vo.Temple
-
-/**
- * Created by matsumoto_k on 2017/11/03.
- */
-class HistoryViewModel(val adapter: HistoryRecyclerAdapter) : LifecycleViewModel() {
-
-    val questRealmHelper = QuestRecordRealmHelper()
-    val monstDataRealmHelper = MonstDataRealmHelper()
-    val refreshLayoutLoading = ObservableBoolean(true)
-    val hisotoryItems = ArrayList<HistoryItem>()
-
-    init {
-        onRefresh()
-    }
-
-    fun onRefresh() {
-        refreshLayoutLoading.set(true)
-        hisotoryItems.clear()
-        questRealmHelper.findAll().sortedByDescending { it.createAt }.forEach {
-            hisotoryItems.add(
-                    HistoryItem(templeName = monstDataRealmHelper.findNameById(Temple::class.java, it.templeId),
-                            fruitName = monstDataRealmHelper.findNameById(Fruit::class.java, it.fruitId),
-                            gradeName = monstDataRealmHelper.findNameById(Grade::class.java, it.gradeId),
-                            createAt = it.createAt)
-            )
-        }
-        adapter.setItemAndRefresh(hisotoryItems)
-        refreshLayoutLoading.set(false)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        monstDataRealmHelper.close()
-        questRealmHelper.close()
-    }
-
-    class Factory(val adapter: HistoryRecyclerAdapter) : ViewModelProvider.NewInstanceFactory() {
-        override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-            return HistoryViewModel(adapter) as T
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/HistoryViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/HistoryViewModel.kt
new file mode 100644
index 0000000..c2db343
--- /dev/null
+++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/HistoryViewModel.kt
@@ -0,0 +1,55 @@
+package jackall.moncalc.viewmodel
+
+import android.arch.lifecycle.ViewModel
+import android.arch.lifecycle.ViewModelProvider
+import android.databinding.ObservableBoolean
+import jackall.moncalc.adapter.HistoryRecyclerAdapter
+import jackall.moncalc.db.MonstDataRealmHelper
+import jackall.moncalc.db.QuestRecordRealmHelper
+import jackall.moncalc.viewmodel.LifecycleViewModel
+import jackall.moncalc.vo.Fruit
+import jackall.moncalc.vo.Grade
+import jackall.moncalc.vo.HistoryItem
+import jackall.moncalc.vo.Temple
+
+/**
+ * Created by matsumoto_k on 2017/11/03.
+ */
+class HistoryViewModel(val adapter: HistoryRecyclerAdapter) : LifecycleViewModel() {
+
+    val questRealmHelper = QuestRecordRealmHelper()
+    val monstDataRealmHelper = MonstDataRealmHelper()
+    val refreshLayoutLoading = ObservableBoolean(true)
+    val hisotoryItems = ArrayList<HistoryItem>()
+
+    init {
+        onRefresh()
+    }
+
+    fun onRefresh() {
+        refreshLayoutLoading.set(true)
+        hisotoryItems.clear()
+        questRealmHelper.findAll().sortedByDescending { it.createAt }.forEach {
+            hisotoryItems.add(
+                    HistoryItem(templeName = monstDataRealmHelper.findNameById(Temple::class.java, it.templeId),
+                            fruitName = monstDataRealmHelper.findNameById(Fruit::class.java, it.fruitId),
+                            gradeName = monstDataRealmHelper.findNameById(Grade::class.java, it.gradeId),
+                            createAt = it.createAt)
+            )
+        }
+        adapter.setItemAndRefresh(hisotoryItems)
+        refreshLayoutLoading.set(false)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        monstDataRealmHelper.close()
+        questRealmHelper.close()
+    }
+
+    class Factory(val adapter: HistoryRecyclerAdapter) : ViewModelProvider.NewInstanceFactory() {
+        override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+            return jackall.moncalc.viewmodel.HistoryViewModel(adapter) as T
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
index 369560a..e962ba4 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -6,7 +6,7 @@
 
         <variable
             name="historyViewModel"
-            type="jackall.moncalc.fragment.HistoryViewModel" />
+            type="jackall.moncalc.viewmodel.HistoryViewModel" />
     </data>
 
     <android.support.constraint.ConstraintLayout