Revert "changes to folder/class names"

This reverts commit 7c4e44de6c78fe380e9f2a51f61cdaf89095159d.