#Android: Change Structure of code