Revert "Revert "directories""

This reverts commit ce0722e22cc93d45c384a39a790d1cf1454bb8ee.