[Refactoring] Refactoring v.1.0.1.
Until v.1.1.0, There might be several / huge difference between single
commits