Revert "In class folders"

This reverts commit 26f1b5ceb2d293cf0d159a698e7116fb1629a542.