removed obsolete dirs
Revert "removed obsolete dirs"

This reverts commit 9363e66c98437649f79d6290536e092add387414.