Start refactoring of Android