Revert "Test file in folders and branches"

This reverts commit 24165d623ebb589aa1fa51aff6381aa579f96bc5.
Revert "Revert "Test file in folders and branches""

This reverts commit 18b6a06f873dda4c893124eaff07df7db6619a23.