Revert "Revert "ディレクトリ整理""

This reverts commit 987278099efc60d4d705168e405bfd349ed2be8a.