Revert "Changed file/folder structure"

This reverts commit 83efd5f2495dcfddfdb2ba13e579559ac3f0dc36.
Revert "Revert "Changed file/folder structure""

This reverts commit e2f4624cc56423c04aa4bb5ae10fae685b823c8d.