Move android code into its own subdir