Revert "file dir cleaned up"

This reverts commit 5459f425f488ecc1cc1f4fbf2720db544e6bb033.