Revert "change directory structure"

This reverts commit 5f1617268533481060b053129a2dd8cfc357dc76.