Refactoring intent API.
31 files changed