Directory renaming
Revert "Directory renaming"

This reverts commit 1fa2b0862a90f50bdcb1851f0f8e11071baa3eea.
Directory renaming