Add todo about re-organization.