Revert "Revert "change repo structure""

This reverts commit 85097a4e3457bdf8f17d7658dfdda9e7a5fb13b5.