UI can handle folder structure now fix #24