Revert "Rearrange directory structure"

This reverts commit acfb4b8c19b58759db9792b1717843bde2b25ccf.