Reorganizing code in AndroidToolkit