diff --git a/.gitignore b/.gitignore
index fb8e9e0..286aac7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,17 @@
 bin/
 gen/
 
-# Local configuration file (sdk path, etc)
-local.properties
-
 # Eclipse project files
 .classpath
 .project
+.settings
+
+# Android Studio
+.gradle/
+.idea/
+build/
+*.iml
+local.properties
+
+# MacOS
+.DS_Store
diff --git a/CountryPicker/AndroidManifest.xml b/CountryPicker/AndroidManifest.xml
deleted file mode 100644
index 07ae6dc..0000000
--- a/CountryPicker/AndroidManifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.countrypicker"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/CountryPicker/build.gradle b/CountryPicker/build.gradle
new file mode 100644
index 0000000..a6a009b
--- /dev/null
+++ b/CountryPicker/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 27
+        versionCode 3
+        versionName '1.2.0'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    api 'com.android.support:support-fragment:27.1.1'
+}
diff --git a/CountryPicker/libs/android-support-v4.jar b/CountryPicker/libs/android-support-v4.jar
deleted file mode 100644
index af90a7f..0000000
Binary files a/CountryPicker/libs/android-support-v4.jar and /dev/null differ
diff --git a/CountryPicker/proguard-project.txt b/CountryPicker/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/CountryPicker/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/CountryPicker/project.properties b/CountryPicker/project.properties
deleted file mode 100644
index 91d2b02..0000000
--- a/CountryPicker/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-19
-android.library=true
diff --git a/CountryPicker/res/drawable-mdpi/ic_launcher.png b/CountryPicker/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047d..0000000
Binary files a/CountryPicker/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/CountryPicker/res/drawable-xhdpi/ic_launcher.png b/CountryPicker/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d76..0000000
Binary files a/CountryPicker/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/CountryPicker/res/values/strings_countries.xml b/CountryPicker/res/values/strings_countries.xml
deleted file mode 100644
index be065f4..0000000
--- a/CountryPicker/res/values/strings_countries.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-
-    <string name="countries">eyJJTSI6IklzbGUgb2YgTWFuIiwiSFIiOiJDcm9hdGlhIiwiR1ciOiJHdWluZWEtQmlzc2F1IiwiSU4iOiJJbmRpYSIsIktFIjoiS2VueWEiLCJMQSI6Ikxhb3MiLCJJTyI6IkJyaXRpc2ggSW5kaWFuIE9jZWFuIFRlcnJpdG9yeSIsIkhUIjoiSGFpdGkiLCJMQiI6IkxlYmFub24iLCJHWSI6Ikd1eWFuYSIsIktHIjoiS3lyZ3l6c3RhbiIsIkhVIjoiSHVuZ2FyeSIsIkxDIjoiU2FpbnQgTHVjaWEiLCJJUSI6IklyYXEiLCJLSCI6IkNhbWJvZGlhIiwiSk0iOiJKYW1haWNhIiwiSVIiOiJJcmFuIiwiS0kiOiJLaXJpYmF0aSIsIklTIjoiSWNlbGFuZCIsIk1BIjoiTW9yb2NjbyIsIkpPIjoiSm9yZGFuIiwiSVQiOiJJdGFseSIsIkpQIjoiSmFwYW4iLCJNQyI6Ik1vbmFjbyIsIktNIjoiQ29tb3JvcyIsIk1EIjoiTW9sZG92YSIsIkxJIjoiTGllY2h0ZW5zdGVpbiIsIktOIjoiU2FpbnQgS2l0dHMgJiBOZXZpcyIsIk1FIjoiTW9udGVuZWdybyIsIk5BIjoiTmFtaWJpYSIsIk1GIjoiU2FpbnQgTWFydGluIChGcmVuY2gpIiwiTEsiOiJTcmkgTGFua2EiLCJLUCI6Ik5vcnRoIEtvcmVhIiwiTUciOiJNYWRhZ2FzY2FyIiwiTkMiOiJOZXcgQ2FsZWRvbmlhIiwiTUgiOiJNYXJzaGFsbCBJc2xhbmRzIiwiS1IiOiJTb3V0aCBLb3JlYSIsIk5FIjoiTmlnZXIiLCJORiI6Ik5vcmZvbGsgSXNsYW5kIiwiTUsiOiJNYWNlZG9uaWEiLCJORyI6Ik5pZ2VyaWEiLCJNTCI6Ik1hbGkiLCJNTSI6Ik15YW5tYXIgKEJ1cm1hKSIsIkxSIjoiTGliZXJpYSIsIk5JIjoiTmljYXJhZ3VhIiwiS1ciOiJLdXdhaXQiLCJNTiI6Ik1vbmdvbGlhIiwiTFMiOiJMZXNvdGhvIiwiUEEiOiJQYW5hbWEiLCJNTyI6Ik1hY2F1IiwiTFQiOiJMaXRodWFuaWEiLCJLWSI6IkNheW1hbiBJc2xhbmRzIiwiTVAiOiJOb3J0aGVybiBNYXJpYW5hIElzbGFuZHMiLCJMVSI6Ikx1eGVtYm91cmciLCJOTCI6Ik5ldGhlcmxhbmRzIiwiS1oiOiJLYXpha2hzdGFuIiwiTVEiOiJNYXJ0aW5pcXVlIiwiTFYiOiJMYXR2aWEiLCJNUiI6Ik1hdXJpdGFuaWEiLCJQRSI6IlBlcnUiLCJNUyI6Ik1vbnRzZXJyYXQiLCJRQSI6IlFhdGFyIiwiTk8iOiJOb3J3YXkiLCJQRiI6IlRhaGl0aSAoRnJlbmNoIFBvbGluZXNpYSkiLCJNVCI6Ik1hbHRhIiwiTFkiOiJMaWJ5YSIsIk5QIjoiTmVwYWwiLCJQRyI6IlBhcHVhIE5ldyBHdWluZWEiLCJNVSI6Ik1hdXJpdGl1cyIsIlBIIjoiUGhpbGlwcGluZXMiLCJNViI6Ik1hbGRpdmVzIiwiT00iOiJPbWFuIiwiTlIiOiJOYXVydSIsIk1XIjoiTWFsYXdpIiwiTVgiOiJNZXhpY28iLCJQSyI6IlBha2lzdGFuIiwiTVkiOiJNYWxheXNpYSIsIk5VIjoiTml1ZSIsIlBMIjoiUG9sYW5kIiwiTVoiOiJNb3phbWJpcXVlIiwiUE0iOiJTYWludCBQaWVycmUgYW5kIE1pcXVlbG9uIiwiUE4iOiJQaXRjYWlybiIsIlJFIjoiUmV1bmlvbiIsIlNBIjoiU2F1ZGkgQXJhYmlhIiwiU0IiOiJTb2xvbW9uIElzbGFuZHMiLCJOWiI6Ik5ldyBaZWFsYW5kIiwiU0MiOiJTZXljaGVsbGVzIiwiU0QiOiJTdWRhbiIsIlBSIjoiUHVlcnRvIFJpY28iLCJTRSI6IlN3ZWRlbiIsIlBTIjoiUGFsZXN0aW5pYW4gVGVycml0b3J5LCBPY2N1cGllZCIsIlBUIjoiUG9ydHVnYWwiLCJTRyI6IlNpbmdhcG9yZSIsIlRDIjoiVHVya3MgYW5kIENhaWNvcyBJc2xhbmRzIiwiU0giOiJTYWludCBIZWxlbmEiLCJURCI6IkNoYWQiLCJTSSI6IlNsb3ZlbmlhIiwiUFciOiJQYWxhdSIsIlNKIjoiU3ZhbGJhcmQgYW5kIEphbiBNYXllbiBJc2xhbmRzIiwiVUEiOiJVa3JhaW5lIiwiUk8iOiJSb21hbmlhIiwiVEYiOiJGcmVuY2ggU291dGhlcm4gVGVycml0b3JpZXMiLCJTSyI6IlNsb3ZhayBSZXB1YmxpYyIsIlBZIjoiUGFyYWd1YXkiLCJURyI6IlRvZ28iLCJTTCI6IlNpZXJyYSBMZW9uZSIsIlRIIjoiVGhhaWxhbmQiLCJTTSI6IlNhbiBNYXJpbm8iLCJTTiI6IlNlbmVnYWwiLCJSUyI6IlNlcmJpYSAoWXVnb3NsYXZpYSkiLCJUSiI6IlRhamlraXN0YW4iLCJWQSI6IlZhdGljYW4gQ2l0eSIsIlNPIjoiU29tYWxpYSIsIlRLIjoiVG9rZWxhdSIsIlVHIjoiVWdhbmRhIiwiUlUiOiJSdXNzaWFuIEZlZGVyYXRpb24iLCJUTCI6IkVhc3QgVGltb3IiLCJWQyI6IlNhaW50IFZpbmNlbnQgJiB0aGUgR3JlbmFkaW5lcyIsIlRNIjoiVHVya21lbmlzdGFuIiwiU1IiOiJTdXJpbmFtZSIsIlJXIjoiUndhbmRhIiwiVE4iOiJUdW5pc2lhIiwiVkUiOiJWZW5lenVlbGEiLCJUTyI6IlRvbmdhIiwiU1QiOiJTYW8gVG9tZSAmIFByaW5jaXBlIiwiVkciOiJCcml0aXNoIFZpcmdpbiBJc2xhbmRzIiwiU1YiOiJFbCBTYWx2YWRvciIsIlVNIjoiVW5pdGVkIFN0YXRlcyBNaW5vciBPdXRseWluZyBJc2xhbmRzIiwiVFIiOiJUdXJrZXkiLCJWSSI6IlZpcmdpbiBJc2xhbmRzIChVUykiLCJXRiI6IldhbGxpcyBhbmQgRnV0dW5hIiwiVFQiOiJUcmluaWRhZCAmIFRvYmFnbyIsIlNZIjoiU3lyaWEiLCJTWiI6IlN3YXppbGFuZCIsIlRWIjoiVHV2YWx1IiwiVFciOiJUYWl3YW4iLCJWTiI6IlZpZXQgTmFtIiwiVVMiOiJVbml0ZWQgU3RhdGVzIChVU0EpIiwiVFoiOiJUYW56YW5pYSIsIllFIjoiWWVtZW4iLCJaQSI6IlNvdXRoIEFmcmljYSIsIlhLIjoiS29zb3ZvIiwiVVkiOiJVcnVndWF5IiwiVlUiOiJWYW51YXR1IiwiVVoiOiJVemJla2lzdGFuIiwiV1MiOiJTYW1vYSIsIlpNIjoiWmFtYmlhIiwiQUMiOiJBc2NlbnNpb24gSXNsYW5kIiwiQUQiOiJBbmRvcnJhIiwiWVQiOiJNYXlvdHRlIiwiQUUiOiJVbml0ZWQgQXJhYiBFbWlyYXRlcyIsIllVIjoiU2VyYmlhIGFuZCBNb250ZW5lZ3JvIiwiQkEiOiJCb3NuaWEgJiBIZXJ6ZWdvdmluYSIsIkFGIjoiQWZnaGFuaXN0YW4iLCJCQiI6IkJhcmJhZG9zIiwiQUciOiJBbnRpZ3VhICYgQmFyYnVkYSIsIkJEIjoiQmFuZ2xhZGVzaCIsIkFJIjoiQW5ndWlsbGEiLCJCRSI6IkJlbGdpdW0iLCJDQSI6IkNhbmFkYSIsIkJGIjoiQnVya2luYSBGYXNvIiwiQkciOiJCdWxnYXJpYSIsIlpXIjoiWmltYmFid2UiLCJBTCI6IkFsYmFuaWEiLCJDQyI6IkNvY29zIChLZWVsaW5nKSBJc2xhbmRzIiwiQkgiOiJCYWhyYWluIiwiQU0iOiJBcm1lbmlhIiwiQ0QiOiJDb25nbywgRGVtb2NyYXRpYyBSZXB1YmxpYyIsIkJJIjoiQnVydW5kaSIsIkFOIjoiTmV0aGVybGFuZHMgQW50aWxsZXMiLCJCSiI6IkJlbmluIiwiQU8iOiJBbmdvbGEiLCJDRiI6IkNlbnRyYWwgQWZyaWNhbiBSZXB1YmxpYyIsIkNHIjoiQ29uZ28iLCJBUSI6IkFudGFyY3RpY2EiLCJDSCI6IlN3aXR6ZXJsYW5kIiwiQk0iOiJCZXJtdWRhIiwiQVIiOiJBcmdlbnRpbmEiLCJDSSI6IkNvdGUgRCdJdm9pcmUgKEl2b3J5IENvYXN0KSIsIkJOIjoiQnJ1bmVpIERhcnVzc2FsYW0iLCJERSI6Ikdlcm1hbnkiLCJBUyI6IkFtZXJpY2FuIFNhbW9hIiwiQk8iOiJCb2xpdmlhIiwiQVQiOiJBdXN0cmlhIiwiQ0siOiJDb29rIElzbGFuZHMiLCJBVSI6IkF1c3RyYWxpYSIsIkNMIjoiQ2hpbGUiLCJFQyI6IkVjdWFkb3IiLCJDTSI6IkNhbWVyb29uIiwiQlIiOiJCcmF6aWwiLCJBVyI6IkFydWJhIiwiQ04iOiJDaGluYSIsIkVFIjoiRXN0b25pYSIsIkJTIjoiQmFoYW1hcyIsIkRKIjoiRGppYm91dGkiLCJBWCI6IkFsYW5kIElzbGFuZHMiLCJDTyI6IkNvbG9tYmlhIiwiQlQiOiJCaHV0YW4iLCJESyI6IkRlbm1hcmsiLCJFRyI6IkVneXB0IiwiQVoiOiJBemVyYmFpamFuIiwiRUgiOiJXZXN0ZXJuIFNhaGFyYSIsIkJWIjoiQm91dmV0IElzbGFuZCIsIkRNIjoiRG9taW5pY2EiLCJDUiI6IkNvc3RhIFJpY2EiLCJCVyI6IkJvdHN3YW5hIiwiR0EiOiJHYWJvbiIsIkRPIjoiRG9taW5pY2FuIFJlcHVibGljIiwiQlkiOiJCZWxhcnVzIiwiR0IiOiJVbml0ZWQgS2luZ2RvbSIsIkNVIjoiQ3ViYSIsIkJaIjoiQmVsaXplIiwiQ1YiOiJDYXBlIFZlcmRlIiwiR0QiOiJHcmVuYWRhIiwiRkkiOiJGaW5sYW5kIiwiR0UiOiJHZW9yZ2lhIiwiRkoiOiJGaWppIiwiQ1giOiJDaHJpc3RtYXMgSXNsYW5kIiwiR0YiOiJGcmVuY2ggR3VpYW5hIiwiRksiOiJGYWxrbGFuZCBJc2xhbmRzIChNYWx2aW5hcykiLCJDWSI6IkN5cHJ1cyIsIkdHIjoiR3Vlcm5zZXkiLCJDWiI6IkN6ZWNoIFJlcHVibGljIiwiR0giOiJHaGFuYSIsIkZNIjoiTWljcm9uZXNpYSIsIkVSIjoiRXJpdHJlYSIsIkdJIjoiR2licmFsdGFyIiwiRVMiOiJTcGFpbiIsIkZPIjoiRmFyb2UgSXNsYW5kcyIsIkVUIjoiRXRoaW9waWEiLCJHTCI6IkdyZWVubGFuZCIsIkRaIjoiQWxnZXJpYSIsIkdNIjoiR2FtYmlhIiwiSUQiOiJJbmRvbmVzaWEiLCJGUiI6IkZyYW5jZSIsIkdOIjoiR3VpbmVhIiwiSUUiOiJJcmVsYW5kIiwiSEsiOiJIb25nIEtvbmciLCJHUCI6Ikd1YWRlbG91cGUiLCJHUSI6IkVxdWF0b3JpYWwgR3VpbmVhIiwiSE0iOiJIZWFyZCBhbmQgTWNEb25hbGQgSXNsYW5kcyIsIkdSIjoiR3JlZWNlIiwiSE4iOiJIb25kdXJhcyIsIkpFIjoiSmVyc2V5IiwiR1MiOiJTb3V0aCBHZW9yZ2lhIGFuZCBTb3V0aCBTYW5kd2ljaCIsIkZYIjoiRnJhbmNlLCBNZXRyb3BvbGl0YW4iLCJHVCI6Ikd1YXRlbWFsYSIsIkdVIjoiR3VhbSIsIklMIjoiSXNyYWVsIn0=</string>
-
-</resources>
\ No newline at end of file
diff --git a/CountryPicker/src/main/AndroidManifest.xml b/CountryPicker/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..9a25d72
--- /dev/null
+++ b/CountryPicker/src/main/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.countrypicker" >
+
+    <application
+        android:allowBackup="true"
+        android:theme="@style/AppTheme" >
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/CountryPicker/src/com/countrypicker/Country.java b/CountryPicker/src/main/java/com/countrypicker/Country.java
similarity index 100%
rename from CountryPicker/src/com/countrypicker/Country.java
rename to CountryPicker/src/main/java/com/countrypicker/Country.java
diff --git a/CountryPicker/src/com/countrypicker/CountryListAdapter.java b/CountryPicker/src/main/java/com/countrypicker/CountryListAdapter.java
similarity index 90%
rename from CountryPicker/src/com/countrypicker/CountryListAdapter.java
rename to CountryPicker/src/main/java/com/countrypicker/CountryListAdapter.java
index 8f3f737..0908840 100644
--- a/CountryPicker/src/com/countrypicker/CountryListAdapter.java
+++ b/CountryPicker/src/main/java/com/countrypicker/CountryListAdapter.java
@@ -27,7 +27,7 @@ public class CountryListAdapter extends BaseAdapter {
 	 * http://stackoverflow.com/
 	 * questions/3042961/how-can-i-get-the-resource-id-of
 	 * -an-image-if-i-know-its-name
-	 * 
+	 *
 	 * @param drawableName
 	 * @return
 	 */
@@ -46,7 +46,7 @@ private int getResId(String drawableName) {
 
 	/**
 	 * Constructor
-	 * 
+	 *
 	 * @param context
 	 * @param countries
 	 */
@@ -60,19 +60,16 @@ public CountryListAdapter(Context context, List<Country> countries) {
 
 	@Override
 	public int getCount() {
-		// TODO Auto-generated method stub
 		return countries.size();
 	}
 
 	@Override
-	public Object getItem(int arg0) {
-		// TODO Auto-generated method stub
+	public Object getItem(int position) {
 		return null;
 	}
 
 	@Override
-	public long getItemId(int arg0) {
-		// TODO Auto-generated method stub
+	public long getItemId(int position) {
 		return 0;
 	}
 
@@ -87,7 +84,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
 		if (convertView == null) {
 			cell = new Cell();
-			cellView = inflater.inflate(R.layout.row, null);
+			cellView = inflater.inflate(R.layout.row, parent, false);
 			cell.textView = (TextView) cellView.findViewById(R.id.row_title);
 			cell.imageView = (ImageView) cellView.findViewById(R.id.row_icon);
 			cellView.setTag(cell);
@@ -106,7 +103,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
 	/**
 	 * Holder for the cell
-	 * 
+	 *
 	 */
 	static class Cell {
 		public TextView textView;
diff --git a/CountryPicker/src/com/countrypicker/CountryPicker.java b/CountryPicker/src/main/java/com/countrypicker/CountryPicker.java
similarity index 81%
rename from CountryPicker/src/com/countrypicker/CountryPicker.java
rename to CountryPicker/src/main/java/com/countrypicker/CountryPicker.java
index cc19e3f..99c61aa 100644
--- a/CountryPicker/src/com/countrypicker/CountryPicker.java
+++ b/CountryPicker/src/main/java/com/countrypicker/CountryPicker.java
@@ -1,23 +1,18 @@
 package com.countrypicker;
 
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Currency;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
-import org.json.JSONObject;
-
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Base64;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -54,9 +49,15 @@ public class CountryPicker extends DialogFragment implements
 	 */
 	private CountryPickerListener listener;
 
+	/**
+	 * Use collator to sort locale-aware.
+	 */
+	private static final Collator sCollator = Collator.getInstance();
+
+
 	/**
 	 * Set listener
-	 * 
+	 *
 	 * @param listener
 	 */
 	public void setListener(CountryPickerListener listener) {
@@ -74,7 +75,7 @@ public ListView getCountryListView() {
 	/**
 	 * Convenient function to get currency code from country code currency code
 	 * is in English locale
-	 * 
+	 *
 	 * @param countryCode
 	 * @return
 	 */
@@ -89,7 +90,7 @@ public static Currency getCurrencyCode(String countryCode) {
 
 	/**
 	 * Get all countries with code and name from res/raw/countries.json
-	 * 
+	 *
 	 * @return
 	 */
 	private List<Country> getAllCountries() {
@@ -97,18 +98,10 @@ private List<Country> getAllCountries() {
 			try {
 				allCountriesList = new ArrayList<Country>();
 
-				// Read from local file
-				String allCountriesString = readFileAsString(getActivity());
-				Log.d("countrypicker", "country: " + allCountriesString);
-				JSONObject jsonObject = new JSONObject(allCountriesString);
-				Iterator<?> keys = jsonObject.keys();
-
-				// Add the data to all countries list
-				while (keys.hasNext()) {
-					String key = (String) keys.next();
+				for (String cc : Locale.getISOCountries()) {
 					Country country = new Country();
-					country.setCode(key);
-					country.setName(jsonObject.getString(key));
+					country.setCode(cc);
+					country.setName(new Locale("", cc).getDisplayCountry());
 					allCountriesList.add(country);
 				}
 
@@ -129,24 +122,9 @@ private List<Country> getAllCountries() {
 		return null;
 	}
 
-	/**
-	 * R.string.countries is a json string which is Base64 encoded to avoid
-	 * special characters in XML. It's Base64 decoded here to get original json.
-	 * 
-	 * @param context
-	 * @return
-	 * @throws java.io.IOException
-	 */
-	private static String readFileAsString(Context context)
-			throws java.io.IOException {
-		String base64 = context.getResources().getString(R.string.countries);
-		byte[] data = Base64.decode(base64, Base64.DEFAULT);
-		return new String(data, "UTF-8");
-	}
-
 	/**
 	 * To support show as dialog
-	 * 
+	 *
 	 * @param dialogTitle
 	 * @return
 	 */
@@ -165,7 +143,7 @@ public static CountryPicker newInstance(String dialogTitle) {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
 		// Inflate view
-		View view = inflater.inflate(R.layout.country_picker, null);
+		View view = inflater.inflate(R.layout.country_picker, container, false);
 
 		// Get countries from the json
 		getAllCountries();
@@ -232,7 +210,7 @@ public void afterTextChanged(Editable s) {
 	/**
 	 * Search allCountriesList contains text and put result into
 	 * selectedCountriesList
-	 * 
+	 *
 	 * @param text
 	 */
 	@SuppressLint("DefaultLocale")
@@ -254,7 +232,7 @@ private void search(String text) {
 	 */
 	@Override
 	public int compare(Country lhs, Country rhs) {
-		return lhs.getName().compareTo(rhs.getName());
+		return sCollator.compare(lhs.getName(), rhs.getName());
 	}
 
 }
diff --git a/CountryPicker/src/com/countrypicker/CountryPickerListener.java b/CountryPicker/src/main/java/com/countrypicker/CountryPickerListener.java
similarity index 100%
rename from CountryPicker/src/com/countrypicker/CountryPickerListener.java
rename to CountryPicker/src/main/java/com/countrypicker/CountryPickerListener.java
diff --git a/CountryPicker/res/drawable-hdpi/flag_ac.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ac.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ac.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ac.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ad.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ad.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ad.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ad.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ae.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ae.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ae.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ae.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_af.png b/CountryPicker/src/main/res/drawable-nodpi/flag_af.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_af.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_af.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ag.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ag.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ag.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ag.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ai.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ai.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ai.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ai.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_al.png b/CountryPicker/src/main/res/drawable-nodpi/flag_al.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_al.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_al.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_am.png b/CountryPicker/src/main/res/drawable-nodpi/flag_am.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_am.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_am.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_an.png b/CountryPicker/src/main/res/drawable-nodpi/flag_an.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_an.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_an.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ao.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ao.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ao.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ao.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_aq.png b/CountryPicker/src/main/res/drawable-nodpi/flag_aq.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_aq.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_aq.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ar.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ar.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ar.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ar.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_as.png b/CountryPicker/src/main/res/drawable-nodpi/flag_as.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_as.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_as.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_at.png b/CountryPicker/src/main/res/drawable-nodpi/flag_at.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_at.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_at.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_au.png b/CountryPicker/src/main/res/drawable-nodpi/flag_au.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_au.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_au.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_aw.png b/CountryPicker/src/main/res/drawable-nodpi/flag_aw.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_aw.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_aw.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ax.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ax.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ax.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ax.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_az.png b/CountryPicker/src/main/res/drawable-nodpi/flag_az.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_az.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_az.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ba.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ba.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ba.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ba.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bb.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bb.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bb.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bb.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bd.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bd.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bd.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bd.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_be.png b/CountryPicker/src/main/res/drawable-nodpi/flag_be.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_be.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_be.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bf.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bf.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bf.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bf.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bg.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bg.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bg.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bg.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bh.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bh.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bh.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bh.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bi.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bi.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bi.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bi.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bj.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bj.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bj.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bj.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bn.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bn.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bn.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bn.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bo.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bo.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bo.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bo.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_br.png b/CountryPicker/src/main/res/drawable-nodpi/flag_br.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_br.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_br.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bs.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bs.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bs.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bs.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bt.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bt.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bt.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bt.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bv.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bv.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bv.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bv.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bw.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bw.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bw.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bw.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_by.png b/CountryPicker/src/main/res/drawable-nodpi/flag_by.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_by.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_by.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_bz.png b/CountryPicker/src/main/res/drawable-nodpi/flag_bz.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_bz.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_bz.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ca.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ca.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ca.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ca.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cc.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cc.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cc.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cc.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cd.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cd.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cd.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cd.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cf.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cf.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cf.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cf.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cg.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cg.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cg.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cg.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ch.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ch.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ch.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ch.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ci.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ci.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ci.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ci.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ck.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ck.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ck.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ck.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cl.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cl.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cl.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cl.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cn.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cn.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cn.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cn.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_co.png b/CountryPicker/src/main/res/drawable-nodpi/flag_co.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_co.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_co.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cr.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cr.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cr.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cr.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cu.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cu.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cu.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cu.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cv.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cv.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cv.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cv.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cx.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cx.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cx.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cx.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cy.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cy.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cy.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cy.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_cz.png b/CountryPicker/src/main/res/drawable-nodpi/flag_cz.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_cz.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_cz.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_de.png b/CountryPicker/src/main/res/drawable-nodpi/flag_de.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_de.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_de.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_dj.png b/CountryPicker/src/main/res/drawable-nodpi/flag_dj.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_dj.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_dj.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_dk.png b/CountryPicker/src/main/res/drawable-nodpi/flag_dk.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_dk.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_dk.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_dm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_dm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_dm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_dm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_do.png b/CountryPicker/src/main/res/drawable-nodpi/flag_do.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_do.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_do.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_dz.png b/CountryPicker/src/main/res/drawable-nodpi/flag_dz.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_dz.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_dz.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ec.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ec.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ec.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ec.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ee.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ee.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ee.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ee.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_eg.png b/CountryPicker/src/main/res/drawable-nodpi/flag_eg.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_eg.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_eg.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_eh.png b/CountryPicker/src/main/res/drawable-nodpi/flag_eh.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_eh.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_eh.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_er.png b/CountryPicker/src/main/res/drawable-nodpi/flag_er.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_er.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_er.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_es.png b/CountryPicker/src/main/res/drawable-nodpi/flag_es.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_es.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_es.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_et.png b/CountryPicker/src/main/res/drawable-nodpi/flag_et.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_et.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_et.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_fi.png b/CountryPicker/src/main/res/drawable-nodpi/flag_fi.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_fi.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_fi.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_fj.png b/CountryPicker/src/main/res/drawable-nodpi/flag_fj.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_fj.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_fj.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_fk.png b/CountryPicker/src/main/res/drawable-nodpi/flag_fk.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_fk.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_fk.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_fm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_fm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_fm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_fm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_fo.png b/CountryPicker/src/main/res/drawable-nodpi/flag_fo.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_fo.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_fo.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_fr.png b/CountryPicker/src/main/res/drawable-nodpi/flag_fr.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_fr.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_fr.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_fx.png b/CountryPicker/src/main/res/drawable-nodpi/flag_fx.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_fx.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_fx.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ga.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ga.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ga.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ga.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gb.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gb.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gb.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gb.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gd.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gd.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gd.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gd.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ge.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ge.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ge.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ge.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gf.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gf.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gf.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gf.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gg.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gg.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gg.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gg.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gh.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gh.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gh.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gh.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gi.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gi.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gi.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gi.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gl.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gl.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gl.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gl.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gn.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gn.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gn.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gn.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gp.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gp.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gp.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gp.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gq.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gq.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gq.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gq.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gr.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gr.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gr.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gr.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gs.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gs.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gs.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gs.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gt.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gt.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gt.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gt.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gu.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gu.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gu.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gu.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gw.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gw.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gw.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gw.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_gy.png b/CountryPicker/src/main/res/drawable-nodpi/flag_gy.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_gy.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_gy.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_hk.png b/CountryPicker/src/main/res/drawable-nodpi/flag_hk.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_hk.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_hk.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_hm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_hm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_hm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_hm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_hn.png b/CountryPicker/src/main/res/drawable-nodpi/flag_hn.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_hn.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_hn.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_hr.png b/CountryPicker/src/main/res/drawable-nodpi/flag_hr.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_hr.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_hr.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ht.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ht.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ht.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ht.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_hu.png b/CountryPicker/src/main/res/drawable-nodpi/flag_hu.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_hu.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_hu.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_id.png b/CountryPicker/src/main/res/drawable-nodpi/flag_id.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_id.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_id.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ie.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ie.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ie.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ie.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_il.png b/CountryPicker/src/main/res/drawable-nodpi/flag_il.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_il.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_il.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_im.png b/CountryPicker/src/main/res/drawable-nodpi/flag_im.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_im.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_im.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_in.png b/CountryPicker/src/main/res/drawable-nodpi/flag_in.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_in.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_in.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_io.png b/CountryPicker/src/main/res/drawable-nodpi/flag_io.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_io.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_io.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_iq.png b/CountryPicker/src/main/res/drawable-nodpi/flag_iq.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_iq.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_iq.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ir.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ir.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ir.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ir.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_is.png b/CountryPicker/src/main/res/drawable-nodpi/flag_is.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_is.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_is.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_it.png b/CountryPicker/src/main/res/drawable-nodpi/flag_it.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_it.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_it.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_je.png b/CountryPicker/src/main/res/drawable-nodpi/flag_je.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_je.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_je.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_jm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_jm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_jm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_jm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_jo.png b/CountryPicker/src/main/res/drawable-nodpi/flag_jo.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_jo.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_jo.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_jp.png b/CountryPicker/src/main/res/drawable-nodpi/flag_jp.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_jp.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_jp.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ke.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ke.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ke.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ke.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_kg.png b/CountryPicker/src/main/res/drawable-nodpi/flag_kg.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_kg.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_kg.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_kh.png b/CountryPicker/src/main/res/drawable-nodpi/flag_kh.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_kh.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_kh.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ki.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ki.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ki.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ki.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_km.png b/CountryPicker/src/main/res/drawable-nodpi/flag_km.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_km.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_km.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_kn.png b/CountryPicker/src/main/res/drawable-nodpi/flag_kn.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_kn.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_kn.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_kp.png b/CountryPicker/src/main/res/drawable-nodpi/flag_kp.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_kp.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_kp.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_kr.png b/CountryPicker/src/main/res/drawable-nodpi/flag_kr.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_kr.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_kr.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_kw.png b/CountryPicker/src/main/res/drawable-nodpi/flag_kw.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_kw.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_kw.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ky.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ky.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ky.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ky.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_kz.png b/CountryPicker/src/main/res/drawable-nodpi/flag_kz.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_kz.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_kz.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_la.png b/CountryPicker/src/main/res/drawable-nodpi/flag_la.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_la.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_la.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_lb.png b/CountryPicker/src/main/res/drawable-nodpi/flag_lb.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_lb.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_lb.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_lc.png b/CountryPicker/src/main/res/drawable-nodpi/flag_lc.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_lc.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_lc.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_li.png b/CountryPicker/src/main/res/drawable-nodpi/flag_li.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_li.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_li.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_lk.png b/CountryPicker/src/main/res/drawable-nodpi/flag_lk.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_lk.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_lk.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_lr.png b/CountryPicker/src/main/res/drawable-nodpi/flag_lr.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_lr.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_lr.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ls.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ls.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ls.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ls.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_lt.png b/CountryPicker/src/main/res/drawable-nodpi/flag_lt.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_lt.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_lt.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_lu.png b/CountryPicker/src/main/res/drawable-nodpi/flag_lu.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_lu.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_lu.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_lv.png b/CountryPicker/src/main/res/drawable-nodpi/flag_lv.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_lv.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_lv.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ly.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ly.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ly.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ly.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ma.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ma.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ma.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ma.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mc.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mc.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mc.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mc.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_md.png b/CountryPicker/src/main/res/drawable-nodpi/flag_md.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_md.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_md.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_me.png b/CountryPicker/src/main/res/drawable-nodpi/flag_me.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_me.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_me.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mf.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mf.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mf.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mf.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mg.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mg.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mg.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mg.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mh.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mh.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mh.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mh.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mk.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mk.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mk.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mk.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ml.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ml.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ml.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ml.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mn.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mn.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mn.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mn.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mo.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mo.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mo.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mo.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mp.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mp.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mp.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mp.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mq.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mq.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mq.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mq.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mr.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mr.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mr.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mr.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ms.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ms.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ms.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ms.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mt.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mt.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mt.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mt.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mu.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mu.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mu.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mu.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mv.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mv.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mv.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mv.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mw.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mw.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mw.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mw.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mx.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mx.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mx.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mx.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_my.png b/CountryPicker/src/main/res/drawable-nodpi/flag_my.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_my.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_my.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_mz.png b/CountryPicker/src/main/res/drawable-nodpi/flag_mz.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_mz.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_mz.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_na.png b/CountryPicker/src/main/res/drawable-nodpi/flag_na.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_na.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_na.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_nc.png b/CountryPicker/src/main/res/drawable-nodpi/flag_nc.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_nc.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_nc.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ne.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ne.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ne.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ne.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_nf.png b/CountryPicker/src/main/res/drawable-nodpi/flag_nf.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_nf.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_nf.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ng.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ng.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ng.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ng.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ni.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ni.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ni.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ni.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_nl.png b/CountryPicker/src/main/res/drawable-nodpi/flag_nl.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_nl.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_nl.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_no.png b/CountryPicker/src/main/res/drawable-nodpi/flag_no.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_no.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_no.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_np.png b/CountryPicker/src/main/res/drawable-nodpi/flag_np.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_np.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_np.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_nr.png b/CountryPicker/src/main/res/drawable-nodpi/flag_nr.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_nr.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_nr.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_nu.png b/CountryPicker/src/main/res/drawable-nodpi/flag_nu.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_nu.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_nu.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_nz.png b/CountryPicker/src/main/res/drawable-nodpi/flag_nz.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_nz.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_nz.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_om.png b/CountryPicker/src/main/res/drawable-nodpi/flag_om.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_om.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_om.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_pa.png b/CountryPicker/src/main/res/drawable-nodpi/flag_pa.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_pa.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_pa.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_pe.png b/CountryPicker/src/main/res/drawable-nodpi/flag_pe.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_pe.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_pe.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_pf.png b/CountryPicker/src/main/res/drawable-nodpi/flag_pf.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_pf.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_pf.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_pg.png b/CountryPicker/src/main/res/drawable-nodpi/flag_pg.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_pg.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_pg.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ph.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ph.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ph.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ph.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_pk.png b/CountryPicker/src/main/res/drawable-nodpi/flag_pk.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_pk.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_pk.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_pl.png b/CountryPicker/src/main/res/drawable-nodpi/flag_pl.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_pl.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_pl.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_pm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_pm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_pm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_pm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_pn.png b/CountryPicker/src/main/res/drawable-nodpi/flag_pn.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_pn.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_pn.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_pr.png b/CountryPicker/src/main/res/drawable-nodpi/flag_pr.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_pr.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_pr.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ps.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ps.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ps.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ps.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_pt.png b/CountryPicker/src/main/res/drawable-nodpi/flag_pt.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_pt.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_pt.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_pw.png b/CountryPicker/src/main/res/drawable-nodpi/flag_pw.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_pw.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_pw.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_py.png b/CountryPicker/src/main/res/drawable-nodpi/flag_py.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_py.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_py.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_qa.png b/CountryPicker/src/main/res/drawable-nodpi/flag_qa.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_qa.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_qa.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_re.png b/CountryPicker/src/main/res/drawable-nodpi/flag_re.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_re.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_re.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ro.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ro.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ro.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ro.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_rs.png b/CountryPicker/src/main/res/drawable-nodpi/flag_rs.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_rs.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_rs.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ru.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ru.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ru.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ru.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_rw.png b/CountryPicker/src/main/res/drawable-nodpi/flag_rw.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_rw.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_rw.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sa.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sa.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sa.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sa.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sb.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sb.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sb.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sb.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sc.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sc.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sc.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sc.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sd.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sd.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sd.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sd.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_se.png b/CountryPicker/src/main/res/drawable-nodpi/flag_se.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_se.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_se.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sg.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sg.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sg.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sg.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sh.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sh.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sh.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sh.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_si.png b/CountryPicker/src/main/res/drawable-nodpi/flag_si.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_si.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_si.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sj.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sj.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sj.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sj.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sk.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sk.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sk.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sk.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sl.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sl.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sl.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sl.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sn.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sn.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sn.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sn.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_so.png b/CountryPicker/src/main/res/drawable-nodpi/flag_so.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_so.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_so.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sr.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sr.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sr.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sr.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_st.png b/CountryPicker/src/main/res/drawable-nodpi/flag_st.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_st.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_st.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sv.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sv.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sv.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sv.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sy.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sy.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sy.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sy.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_sz.png b/CountryPicker/src/main/res/drawable-nodpi/flag_sz.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_sz.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_sz.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tc.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tc.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tc.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tc.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_td.png b/CountryPicker/src/main/res/drawable-nodpi/flag_td.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_td.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_td.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tf.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tf.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tf.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tf.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tg.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tg.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tg.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tg.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_th.png b/CountryPicker/src/main/res/drawable-nodpi/flag_th.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_th.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_th.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tj.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tj.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tj.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tj.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tk.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tk.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tk.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tk.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tl.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tl.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tl.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tl.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tn.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tn.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tn.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tn.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_to.png b/CountryPicker/src/main/res/drawable-nodpi/flag_to.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_to.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_to.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tr.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tr.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tr.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tr.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tt.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tt.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tt.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tt.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tv.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tv.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tv.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tv.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tw.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tw.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tw.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tw.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_tz.png b/CountryPicker/src/main/res/drawable-nodpi/flag_tz.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_tz.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_tz.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ua.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ua.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ua.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ua.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ug.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ug.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ug.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ug.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_um.png b/CountryPicker/src/main/res/drawable-nodpi/flag_um.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_um.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_um.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_us.png b/CountryPicker/src/main/res/drawable-nodpi/flag_us.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_us.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_us.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_uy.png b/CountryPicker/src/main/res/drawable-nodpi/flag_uy.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_uy.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_uy.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_uz.png b/CountryPicker/src/main/res/drawable-nodpi/flag_uz.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_uz.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_uz.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_va.png b/CountryPicker/src/main/res/drawable-nodpi/flag_va.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_va.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_va.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_vc.png b/CountryPicker/src/main/res/drawable-nodpi/flag_vc.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_vc.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_vc.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ve.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ve.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ve.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ve.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_vg.png b/CountryPicker/src/main/res/drawable-nodpi/flag_vg.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_vg.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_vg.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_vi.png b/CountryPicker/src/main/res/drawable-nodpi/flag_vi.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_vi.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_vi.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_vn.png b/CountryPicker/src/main/res/drawable-nodpi/flag_vn.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_vn.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_vn.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_vu.png b/CountryPicker/src/main/res/drawable-nodpi/flag_vu.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_vu.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_vu.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_wf.png b/CountryPicker/src/main/res/drawable-nodpi/flag_wf.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_wf.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_wf.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ws.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ws.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ws.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ws.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_xk.png b/CountryPicker/src/main/res/drawable-nodpi/flag_xk.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_xk.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_xk.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_ye.png b/CountryPicker/src/main/res/drawable-nodpi/flag_ye.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_ye.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_ye.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_yt.png b/CountryPicker/src/main/res/drawable-nodpi/flag_yt.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_yt.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_yt.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_yu.png b/CountryPicker/src/main/res/drawable-nodpi/flag_yu.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_yu.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_yu.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_za.png b/CountryPicker/src/main/res/drawable-nodpi/flag_za.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_za.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_za.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_zm.png b/CountryPicker/src/main/res/drawable-nodpi/flag_zm.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_zm.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_zm.png
diff --git a/CountryPicker/res/drawable-hdpi/flag_zw.png b/CountryPicker/src/main/res/drawable-nodpi/flag_zw.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/flag_zw.png
rename to CountryPicker/src/main/res/drawable-nodpi/flag_zw.png
diff --git a/CountryPicker/res/drawable-hdpi/search_icon.png b/CountryPicker/src/main/res/drawable-nodpi/search_icon.png
similarity index 100%
rename from CountryPicker/res/drawable-hdpi/search_icon.png
rename to CountryPicker/src/main/res/drawable-nodpi/search_icon.png
diff --git a/CountryPicker/res/layout/country_picker.xml b/CountryPicker/src/main/res/layout/country_picker.xml
similarity index 87%
rename from CountryPicker/res/layout/country_picker.xml
rename to CountryPicker/src/main/res/layout/country_picker.xml
index 32f9cbe..ca5fc4e 100644
--- a/CountryPicker/res/layout/country_picker.xml
+++ b/CountryPicker/src/main/res/layout/country_picker.xml
@@ -10,7 +10,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
         android:hint="@string/search"
-        android:drawableLeft="@drawable/search_icon" />
+        android:drawableLeft="@drawable/search_icon"
+        android:drawableStart="@drawable/search_icon" />
 
     <ListView
         android:id="@+id/country_picker_listview"
diff --git a/CountryPicker/res/layout/row.xml b/CountryPicker/src/main/res/layout/row.xml
similarity index 88%
rename from CountryPicker/res/layout/row.xml
rename to CountryPicker/src/main/res/layout/row.xml
index bb65eba..800bfb6 100644
--- a/CountryPicker/res/layout/row.xml
+++ b/CountryPicker/src/main/res/layout/row.xml
@@ -9,6 +9,8 @@
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
+        android:contentDescription="@string/Flag"
         android:padding="10dp" />
 
     <TextView
diff --git a/CountryPicker/res/values/dimens.xml b/CountryPicker/src/main/res/values/dimens.xml
similarity index 100%
rename from CountryPicker/res/values/dimens.xml
rename to CountryPicker/src/main/res/values/dimens.xml
diff --git a/CountryPicker/res/values/strings.xml b/CountryPicker/src/main/res/values/strings.xml
similarity index 59%
rename from CountryPicker/res/values/strings.xml
rename to CountryPicker/src/main/res/values/strings.xml
index 0740aaf..40ddac7 100644
--- a/CountryPicker/res/values/strings.xml
+++ b/CountryPicker/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <string name="app_name">CountryPicker</string>
     <string name="search">Search&#8230;</string>
+    <string name="Flag">Flag</string>
 
 </resources>
\ No newline at end of file
diff --git a/CountryPicker/res/values/styles.xml b/CountryPicker/src/main/res/values/styles.xml
similarity index 100%
rename from CountryPicker/res/values/styles.xml
rename to CountryPicker/src/main/res/values/styles.xml
diff --git a/CountryPickerExample/ic_launcher-web.png b/CountryPickerExample/ic_launcher-web.png
deleted file mode 100644
index a18cbb4..0000000
Binary files a/CountryPickerExample/ic_launcher-web.png and /dev/null differ
diff --git a/CountryPickerExample/proguard-project.txt b/CountryPickerExample/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/CountryPickerExample/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/CountryPickerExample/project.properties b/CountryPickerExample/project.properties
deleted file mode 100644
index f75d1fa..0000000
--- a/CountryPickerExample/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-17
-android.library.reference.1=../CountryPicker
diff --git a/CountryPickerExample/res/values-v11/styles.xml b/CountryPickerExample/res/values-v11/styles.xml
deleted file mode 100644
index 541752f..0000000
--- a/CountryPickerExample/res/values-v11/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <!--
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
-        <!-- API 11 theme customizations can go here. -->
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/CountryPickerExample/res/values-v14/styles.xml b/CountryPickerExample/res/values-v14/styles.xml
deleted file mode 100644
index f20e015..0000000
--- a/CountryPickerExample/res/values-v14/styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<resources>
-
-    <!--
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
-        <!-- API 14 theme customizations can go here. -->
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/CountryPickerExample/AndroidManifest.xml b/CountryPickerExample/src/main/AndroidManifest.xml
similarity index 100%
rename from CountryPickerExample/AndroidManifest.xml
rename to CountryPickerExample/src/main/AndroidManifest.xml
diff --git a/CountryPickerExample/src/com/countrypickerexample/MainActivity.java b/CountryPickerExample/src/main/java/com/countrypickerexample/MainActivity.java
similarity index 100%
rename from CountryPickerExample/src/com/countrypickerexample/MainActivity.java
rename to CountryPickerExample/src/main/java/com/countrypickerexample/MainActivity.java
diff --git a/CountryPickerExample/res/drawable-hdpi/ic_launcher.png b/CountryPickerExample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from CountryPickerExample/res/drawable-hdpi/ic_launcher.png
rename to CountryPickerExample/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/CountryPickerExample/res/drawable-mdpi/ic_launcher.png b/CountryPickerExample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from CountryPickerExample/res/drawable-mdpi/ic_launcher.png
rename to CountryPickerExample/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/CountryPickerExample/res/drawable-xhdpi/ic_launcher.png b/CountryPickerExample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from CountryPickerExample/res/drawable-xhdpi/ic_launcher.png
rename to CountryPickerExample/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/CountryPickerExample/res/drawable-xxhdpi/ic_launcher.png b/CountryPickerExample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from CountryPickerExample/res/drawable-xxhdpi/ic_launcher.png
rename to CountryPickerExample/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/CountryPickerExample/res/layout/activity_main.xml b/CountryPickerExample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from CountryPickerExample/res/layout/activity_main.xml
rename to CountryPickerExample/src/main/res/layout/activity_main.xml
diff --git a/CountryPickerExample/res/menu/main.xml b/CountryPickerExample/src/main/res/menu/main.xml
similarity index 100%
rename from CountryPickerExample/res/menu/main.xml
rename to CountryPickerExample/src/main/res/menu/main.xml
diff --git a/CountryPickerExample/res/values-sw600dp/dimens.xml b/CountryPickerExample/src/main/res/values-sw600dp/dimens.xml
similarity index 100%
rename from CountryPickerExample/res/values-sw600dp/dimens.xml
rename to CountryPickerExample/src/main/res/values-sw600dp/dimens.xml
diff --git a/CountryPickerExample/res/values-sw720dp-land/dimens.xml b/CountryPickerExample/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from CountryPickerExample/res/values-sw720dp-land/dimens.xml
rename to CountryPickerExample/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/CountryPicker/res/values-v11/styles.xml b/CountryPickerExample/src/main/res/values-v11/styles.xml
similarity index 100%
rename from CountryPicker/res/values-v11/styles.xml
rename to CountryPickerExample/src/main/res/values-v11/styles.xml
diff --git a/CountryPicker/res/values-v14/styles.xml b/CountryPickerExample/src/main/res/values-v14/styles.xml
similarity index 100%
rename from CountryPicker/res/values-v14/styles.xml
rename to CountryPickerExample/src/main/res/values-v14/styles.xml
diff --git a/CountryPickerExample/res/values/dimens.xml b/CountryPickerExample/src/main/res/values/dimens.xml
similarity index 100%
rename from CountryPickerExample/res/values/dimens.xml
rename to CountryPickerExample/src/main/res/values/dimens.xml
diff --git a/CountryPickerExample/res/values/strings.xml b/CountryPickerExample/src/main/res/values/strings.xml
similarity index 100%
rename from CountryPickerExample/res/values/strings.xml
rename to CountryPickerExample/src/main/res/values/strings.xml
diff --git a/CountryPickerExample/res/values/styles.xml b/CountryPickerExample/src/main/res/values/styles.xml
similarity index 100%
rename from CountryPickerExample/res/values/styles.xml
rename to CountryPickerExample/src/main/res/values/styles.xml
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..58039f1
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,17 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        jcenter()
+        google()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.1.1'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        google()
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..13372ae
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..24e7c39
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..76d79b3
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':CountryPicker'