Revert "Revert "Commit #1 of Full Directory""

This reverts commit 6b562c831a040cef2d94cf69c06697c3c4ba6d06.