diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/CounterAdapter.kt b/app/src/main/kotlin/jackall/overlaymulticounter/CounterAdapter.kt
deleted file mode 100644
index 67558ea..0000000
--- a/app/src/main/kotlin/jackall/overlaymulticounter/CounterAdapter.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package jackall.overlaymulticounter
-
-import android.content.Context
-import android.databinding.DataBindingUtil
-import android.support.v7.widget.RecyclerView
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import jackall.overlaymulticounter.databinding.ListCounterItemBinding
-import jackall.overlaymulticounter.viewmodel.CounterItemViewModel
-
-/**
- * Created by matsumoto_k on 2017/11/08.
- */
-class CounterAdapter(val context: Context, val items: ArrayList<CounterItemViewModel>) : RecyclerView.Adapter<CounterAdapter.ViewHolder>() {
-    override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
-        val binding = DataBindingUtil.inflate<ListCounterItemBinding>(LayoutInflater.from(context), R.layout.list_counter_item, parent, false)
-        return ViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder?, position: Int) {
-        holder?.binding?.counterItemViewModel = items.get(position)
-    }
-
-    override fun getItemCount(): Int {
-        return items.count()
-    }
-
-    fun insert(item: CounterItemViewModel) {
-        items.add(item)
-        notifyItemInserted(itemCount)
-    }
-
-    fun remove(position: Int) {
-        items.removeAt(position)
-        notifyItemRemoved(position)
-    }
-
-    inner class ViewHolder(val binding: ListCounterItemBinding) : RecyclerView.ViewHolder(binding.root)
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/adapter/CounterAdapter.kt b/app/src/main/kotlin/jackall/overlaymulticounter/adapter/CounterAdapter.kt
new file mode 100644
index 0000000..181343e
--- /dev/null
+++ b/app/src/main/kotlin/jackall/overlaymulticounter/adapter/CounterAdapter.kt
@@ -0,0 +1,40 @@
+package jackall.overlaymulticounter.adapter
+
+import android.content.Context
+import android.databinding.DataBindingUtil
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import jackall.overlaymulticounter.R
+import jackall.overlaymulticounter.databinding.ListCounterItemBinding
+import jackall.overlaymulticounter.viewmodel.CounterItemViewModel
+
+/**
+ * Created by matsumoto_k on 2017/11/08.
+ */
+class CounterAdapter(val context: Context, val items: ArrayList<CounterItemViewModel>) : RecyclerView.Adapter<CounterAdapter.ViewHolder>() {
+    override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
+        val binding = DataBindingUtil.inflate<ListCounterItemBinding>(LayoutInflater.from(context), R.layout.list_counter_item, parent, false)
+        return ViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder?, position: Int) {
+        holder?.binding?.counterItemViewModel = items.get(position)
+    }
+
+    override fun getItemCount(): Int {
+        return items.count()
+    }
+
+    fun insert(item: CounterItemViewModel) {
+        items.add(item)
+        notifyItemInserted(itemCount)
+    }
+
+    fun remove(position: Int) {
+        items.removeAt(position)
+        notifyItemRemoved(position)
+    }
+
+    inner class ViewHolder(val binding: ListCounterItemBinding) : RecyclerView.ViewHolder(binding.root)
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/MainViewModel.kt b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/MainViewModel.kt
index 15d3899..f9f0b92 100644
--- a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/MainViewModel.kt
+++ b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/MainViewModel.kt
@@ -17,7 +17,7 @@
 import io.realm.OrderedRealmCollectionChangeListener
 import io.realm.RealmResults
 import jackall.overlaymulticounter.App
-import jackall.overlaymulticounter.CounterAdapter
+import jackall.overlaymulticounter.adapter.CounterAdapter
 import jackall.overlaymulticounter.R
 import jackall.overlaymulticounter.contract.CounterContract
 import jackall.overlaymulticounter.db.CounterRealmHelper
diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt
index e226cbc..8a37b82 100644
--- a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt
+++ b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt
@@ -9,7 +9,7 @@
 import io.realm.OrderedRealmCollectionChangeListener
 import io.realm.RealmResults
 import jackall.overlaymulticounter.App
-import jackall.overlaymulticounter.CounterAdapter
+import jackall.overlaymulticounter.adapter.CounterAdapter
 import jackall.overlaymulticounter.R
 import jackall.overlaymulticounter.contract.CounterContract
 import jackall.overlaymulticounter.db.CounterRealmHelper