Version 1.0 rewrite to support nested folders