Refactored to Android Studio / Gradle project