Fixed OrganizationId typo
Removed ServiceContext and replaced with Organization
Update script includes