Moving android code into sub directory