Refactored structure.

Fixed typo.