Added subfolders, test