Refactor the directory strucure

![img](http://snag.gy/93ykA.jpg)