Restructured for Android/studio/gradle