Refactoring intent API.
28 files changed