fixing redundant directory name
Revert "fixing redundant directory name"

This reverts commit d0f7f0742dcd7c0c73edab591113eaac3c3e56d7.
more fixes