[Bookmarks] Rewrite for increased flexibility. Handle subfolders