Revert "Files and folders rearrangement"

This reverts commit d9dd01a13490d1f16d578e483c0393236d79cf04.
Revert "Revert "Files and folders rearrangement""

This reverts commit 39ffc1c60d808a401515560cbe8494cccd746ae7.