Folder switch

![merge](https://f.cloud.github.com/assets/5192972/1649468/9b850370-5a04-11e3-92aa-f188ab7ef620.gif)