Revert "Directory setup"

This reverts commit 5773deccb78e112b5088526fcce482683c66fe25.
Revert "Revert "Directory setup""

This reverts commit f9a6085c2fa82f3fece6a3f4d54ead24dc0209ff.
fix