Revert "subfolder"

This reverts commit baaadcb453959e7bdf00ad80bccdd241be56a58f.