Revert "delete unnecessary dir layer"

This reverts commit 8a66359a7fe10c98734e95cb04997f7ed1adcea6.
properly move to correct directory