Support nested folders

@EnlightenedCode please review
@alex-deaconu FYI