First rearranging of source for Android version