Reorganizing refactoring

Adding some tests ~

![](http://media.giphy.com/media/Me4EzFBA2JuiQ/giphy.gif)