Revert "move directories"

This reverts commit 0ea47d79cb0940002343b7fb32984e0cea1d7eda.