Restructuring folders

I've taken a similar approach to Nancy.