Feature nested folders

https://www.pivotaltracker.com/story/show/59341796