Revert "Version 1.0 rewrite to support nested folders"

This reverts commit c9189c2f2d28fc8e0da4e4c58301c0db91a09c7f.
Revert "Revert "Version 1.0 rewrite to support nested folders""

This reverts commit 731ed7ebefd61c697cc3a51ede10a226b64fa21a.