Revert "Changed folder structure"

This reverts commit 448652344d8dafb74008b3133fe0a28e87dadd71.