Revert "Revert "berkshelf (1.3.1)で実行できるようにフォルダ構成を変更""

This reverts commit c7468ab0b679e10315f86f719930cf2670d58382.