Revert "directory structure reordered"

This reverts commit 6f51fa30e371f2244ea1e9b2c2bdfdd0de58481a.