Migrated all data to Organization block structure