Continuing to refactor extendo/extendo-android