Android Studio

Project tree structure refactoring.