Revert "Folder Organisation"

This reverts commit 289ce8c61e08f44fcfa9df65a713c703811bd33d.

Folder organisation 3