Revert "Rearrange directory structure."

This reverts commit 44c5d8caa0fd74c9a45310fbab987e3198983531.