Revert "improve style"

This reverts commit 7a6bb4d347d0802a186215ee3474c3e424aeba86.
Revert "Revert "improve style""

This reverts commit 161e32360d7b166512b16bd6688fe1316c761d9a.
improve style; rename folder;