Revert "New structure (1.0.1)"

This reverts commit b6fcb5ee459196d1b43209c47b0e0bcf64d59acd.