Revert "Refactoring"

This reverts commit 3e8ecd711873505fd22e0aa67f911f6a5c1bcfa8.
Revert "Bump 0.1.1"

This reverts commit c493a9b46d49c5d0fce4652727a7ce314a5ebdc4.