[CLEANUP] - Rearrange structure.