Revert "rearrange directories and files"

This reverts commit 14ab58dbf9b53e87ebc7ed468c5e5000dbd2e9ba.
Revert "Revert "rearrange directories and files""

This reverts commit be2d6f0ddc889e2ba666bccf7e71f42f6f8f035d.