Revert "New Dir structure"

This reverts commit 73490a152abcca7db0055d764e4f98956a3f2ea6.