Add support for Android Studio along with some minor refactoring