refactoring code migrated to new API
237 files changed