Revert "Koie class included"

This reverts commit 1b3506a727f03f57cacd1158c0d38fc70fab4e60.
Revert "Revert "Koie class included""

This reverts commit a5a8194b5fc1d1565487bcb73eeeca23a0eaad02.
Revert "Revert "Revert "Koie class included"""

This reverts commit 8cc81355df558a406ee2665f79c30ebf697d0e89.