Revert "renamed folders"

This reverts commit f53b1dc48aae0d246b46ed8cb5826b628e18f65b.