Revert "Updates to default dir"

This reverts commit 1426324a0cf8e9b6c5b11d87c94d40a0c92a2473.
Revert "Revert "Updates to default dir""

This reverts commit 81552ddaf430deff658a96a161f99be43e92f7f8.