Revert "Folder change"

This reverts commit 49cd44ce585a5cc2c81a1e4c04c375605f64925d.