SinglePageAppRelated re-organization