Revert "[S] 구조를 바꿨는데 문제가 많아짐..."

This reverts commit 42b50094323de5b390d963b3ff01bcf0588fd833.