Revert "Move folders"

This reverts commit fb8728308c8ae20ab99ddb9f25a6c828581c5195.