Fix Deprecations, Use New API, Migrate Org