Changed the structure back.

>.<