diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b64ed6d..f7857cf 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,7 +12,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/toasterlibrary" />
+            <option value="$PROJECT_DIR$/baatolibrary" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/app/src/main/java/com/kathmandulivinglabs/osmnavigationapp/MainActivity.java b/app/src/main/java/com/kathmandulivinglabs/osmnavigationapp/MainActivity.java
index 0b47a3a..215780f 100644
--- a/app/src/main/java/com/kathmandulivinglabs/osmnavigationapp/MainActivity.java
+++ b/app/src/main/java/com/kathmandulivinglabs/osmnavigationapp/MainActivity.java
@@ -25,6 +25,11 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
         ToasterMessage.s(this, "Hello Good Morning");
         Geometry geometry = BaatoUtil.getGeoJsonFromEncodedPolyLine(encoded);
+
+        performReverseGeoCoding();
+    }
+
+    private void performReverseGeoCoding() {
         new BaatoReverseGeoCodeService(this)
                 .setGeoCode(new Geocode(27.73405, 85.33685))
                 .setAccessToken(Constants.TOKEN)
diff --git a/toasterlibrary/.gitignore b/baatolibrary/.gitignore
similarity index 100%
rename from toasterlibrary/.gitignore
rename to baatolibrary/.gitignore
diff --git a/toasterlibrary/build.gradle b/baatolibrary/build.gradle
similarity index 100%
rename from toasterlibrary/build.gradle
rename to baatolibrary/build.gradle
diff --git a/toasterlibrary/consumer-rules.pro b/baatolibrary/consumer-rules.pro
similarity index 100%
rename from toasterlibrary/consumer-rules.pro
rename to baatolibrary/consumer-rules.pro
diff --git a/toasterlibrary/proguard-rules.pro b/baatolibrary/proguard-rules.pro
similarity index 100%
rename from toasterlibrary/proguard-rules.pro
rename to baatolibrary/proguard-rules.pro
diff --git a/toasterlibrary/src/androidTest/java/com/kathmandulivinglabs/navigationlibrary/ExampleInstrumentedTest.java b/baatolibrary/src/androidTest/java/com/kathmandulivinglabs/baatolibrary/ExampleInstrumentedTest.java
similarity index 93%
rename from toasterlibrary/src/androidTest/java/com/kathmandulivinglabs/navigationlibrary/ExampleInstrumentedTest.java
rename to baatolibrary/src/androidTest/java/com/kathmandulivinglabs/baatolibrary/ExampleInstrumentedTest.java
index 59b7678..8bb1a59 100644
--- a/toasterlibrary/src/androidTest/java/com/kathmandulivinglabs/navigationlibrary/ExampleInstrumentedTest.java
+++ b/baatolibrary/src/androidTest/java/com/kathmandulivinglabs/baatolibrary/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.kathmandulivinglabs.navigationlibrary;
+package com.kathmandulivinglabs.baatolibrary;
 
 import android.content.Context;
 
diff --git a/toasterlibrary/src/main/AndroidManifest.xml b/baatolibrary/src/main/AndroidManifest.xml
similarity index 100%
rename from toasterlibrary/src/main/AndroidManifest.xml
rename to baatolibrary/src/main/AndroidManifest.xml
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/application/App.java b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/application/App.java
similarity index 97%
rename from toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/application/App.java
rename to baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/application/App.java
index af955a2..4e99c88 100644
--- a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/application/App.java
+++ b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/application/App.java
@@ -1,4 +1,4 @@
-package com.kathmandulivinglabs.navigationlibrary.application;
+package com.kathmandulivinglabs.baatolibrary.application;
 
 import android.app.Application;
 import android.content.Context;
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/application/TinyDB.java b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/application/TinyDB.java
similarity index 99%
rename from toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/application/TinyDB.java
rename to baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/application/TinyDB.java
index fee53b6..6268aea 100644
--- a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/application/TinyDB.java
+++ b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/application/TinyDB.java
@@ -19,7 +19,7 @@
  *  and unicode 2017 that are used for separating the items in a list.
  */
 
-package com.kathmandulivinglabs.navigationlibrary.application;
+package com.kathmandulivinglabs.baatolibrary.application;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/models/Geocode.java b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/models/Geocode.java
similarity index 72%
rename from toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/models/Geocode.java
rename to baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/models/Geocode.java
index 3c1703d..70a5eec 100644
--- a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/models/Geocode.java
+++ b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/models/Geocode.java
@@ -1,4 +1,4 @@
-package com.kathmandulivinglabs.navigationlibrary.models;
+package com.kathmandulivinglabs.baatolibrary.models;
 
 public class Geocode {
     public double lat,lon;
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/models/Geometry.java b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/models/Geometry.java
similarity index 78%
rename from toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/models/Geometry.java
rename to baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/models/Geometry.java
index a36e11e..b59e27e 100644
--- a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/models/Geometry.java
+++ b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/models/Geometry.java
@@ -1,4 +1,4 @@
-package com.kathmandulivinglabs.navigationlibrary.models;
+package com.kathmandulivinglabs.baatolibrary.models;
 
 public class Geometry {
     public String type;
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/models/Place.java b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/models/Place.java
similarity index 94%
rename from toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/models/Place.java
rename to baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/models/Place.java
index 8b8c5cc..560abcf 100755
--- a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/models/Place.java
+++ b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/models/Place.java
@@ -1,4 +1,4 @@
-package com.kathmandulivinglabs.navigationlibrary.models;
+package com.kathmandulivinglabs.baatolibrary.models;
 
 import java.util.List;
 
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/requests/QueryAPI.java b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/requests/QueryAPI.java
similarity index 74%
rename from toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/requests/QueryAPI.java
rename to baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/requests/QueryAPI.java
index 773e1eb..740fc33 100644
--- a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/requests/QueryAPI.java
+++ b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/requests/QueryAPI.java
@@ -1,6 +1,6 @@
-package com.kathmandulivinglabs.navigationlibrary.requests;
+package com.kathmandulivinglabs.baatolibrary.requests;
 
-import com.kathmandulivinglabs.navigationlibrary.models.Place;
+import com.kathmandulivinglabs.baatolibrary.models.Place;
 
 import java.util.List;
 
diff --git a/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/responses/ReverseGeoCodeResponse.java b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/responses/ReverseGeoCodeResponse.java
new file mode 100644
index 0000000..abe0e46
--- /dev/null
+++ b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/responses/ReverseGeoCodeResponse.java
@@ -0,0 +1,4 @@
+package com.kathmandulivinglabs.baatolibrary.responses;
+
+public class ReverseGeoCodeResponse {
+}
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/services/BaatoReverseGeoCodeService.java b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/services/BaatoReverseGeoCodeService.java
similarity index 86%
rename from toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/services/BaatoReverseGeoCodeService.java
rename to baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/services/BaatoReverseGeoCodeService.java
index 7e6ead7..ab1aafd 100644
--- a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/services/BaatoReverseGeoCodeService.java
+++ b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/services/BaatoReverseGeoCodeService.java
@@ -1,15 +1,13 @@
-package com.kathmandulivinglabs.navigationlibrary.services;
+package com.kathmandulivinglabs.baatolibrary.services;
 
 import android.content.Context;
-import android.location.Geocoder;
 
 import androidx.annotation.NonNull;
 
-import com.kathmandulivinglabs.navigationlibrary.application.App;
-import com.kathmandulivinglabs.navigationlibrary.models.Geocode;
-import com.kathmandulivinglabs.navigationlibrary.models.Geometry;
-import com.kathmandulivinglabs.navigationlibrary.models.Place;
-import com.kathmandulivinglabs.navigationlibrary.requests.QueryAPI;
+import com.kathmandulivinglabs.baatolibrary.application.App;
+import com.kathmandulivinglabs.baatolibrary.models.Geocode;
+import com.kathmandulivinglabs.baatolibrary.models.Place;
+import com.kathmandulivinglabs.baatolibrary.requests.QueryAPI;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/services/BaatoSearchService.java b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/services/BaatoSearchService.java
similarity index 90%
rename from toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/services/BaatoSearchService.java
rename to baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/services/BaatoSearchService.java
index 9b75029..2b506ca 100644
--- a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/services/BaatoSearchService.java
+++ b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/services/BaatoSearchService.java
@@ -1,12 +1,12 @@
-package com.kathmandulivinglabs.navigationlibrary.services;
+package com.kathmandulivinglabs.baatolibrary.services;
 
 import android.content.Context;
 
 import androidx.annotation.NonNull;
 
-import com.kathmandulivinglabs.navigationlibrary.application.App;
-import com.kathmandulivinglabs.navigationlibrary.models.Place;
-import com.kathmandulivinglabs.navigationlibrary.requests.QueryAPI;
+import com.kathmandulivinglabs.baatolibrary.application.App;
+import com.kathmandulivinglabs.baatolibrary.models.Place;
+import com.kathmandulivinglabs.baatolibrary.requests.QueryAPI;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/services/ToasterMessage.java b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/services/ToasterMessage.java
similarity index 62%
rename from toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/services/ToasterMessage.java
rename to baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/services/ToasterMessage.java
index 2de6f67..47efa55 100644
--- a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/services/ToasterMessage.java
+++ b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/services/ToasterMessage.java
@@ -1,10 +1,8 @@
-package com.kathmandulivinglabs.navigationlibrary.services;
+package com.kathmandulivinglabs.baatolibrary.services;
 
 import android.content.Context;
 import android.widget.Toast;
 
-import com.kathmandulivinglabs.navigationlibrary.utilities.BaatoUtil;
-
 public class ToasterMessage {
 
     public static void s(Context c, String message) {
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/utilities/BaatoUtil.java b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/utilities/BaatoUtil.java
similarity index 93%
rename from toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/utilities/BaatoUtil.java
rename to baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/utilities/BaatoUtil.java
index ffc214f..c4e27b5 100644
--- a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/utilities/BaatoUtil.java
+++ b/baatolibrary/src/main/java/com/kathmandulivinglabs/baatolibrary/utilities/BaatoUtil.java
@@ -1,9 +1,8 @@
-package com.kathmandulivinglabs.navigationlibrary.utilities;
+package com.kathmandulivinglabs.baatolibrary.utilities;
 
 import android.util.Log;
-import android.widget.Toast;
 
-import com.kathmandulivinglabs.navigationlibrary.models.Geometry;
+import com.kathmandulivinglabs.baatolibrary.models.Geometry;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/toasterlibrary/src/main/res/values/strings.xml b/baatolibrary/src/main/res/values/strings.xml
similarity index 100%
rename from toasterlibrary/src/main/res/values/strings.xml
rename to baatolibrary/src/main/res/values/strings.xml
diff --git a/toasterlibrary/src/main/res/xml/network_security_config.xml b/baatolibrary/src/main/res/xml/network_security_config.xml
similarity index 100%
rename from toasterlibrary/src/main/res/xml/network_security_config.xml
rename to baatolibrary/src/main/res/xml/network_security_config.xml
diff --git a/toasterlibrary/src/test/java/com/kathmandulivinglabs/navigationlibrary/ExampleUnitTest.java b/baatolibrary/src/test/java/com/kathmandulivinglabs/baatolibrary/ExampleUnitTest.java
similarity index 87%
rename from toasterlibrary/src/test/java/com/kathmandulivinglabs/navigationlibrary/ExampleUnitTest.java
rename to baatolibrary/src/test/java/com/kathmandulivinglabs/baatolibrary/ExampleUnitTest.java
index adf259f..1183506 100644
--- a/toasterlibrary/src/test/java/com/kathmandulivinglabs/navigationlibrary/ExampleUnitTest.java
+++ b/baatolibrary/src/test/java/com/kathmandulivinglabs/baatolibrary/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.kathmandulivinglabs.navigationlibrary;
+package com.kathmandulivinglabs.baatolibrary;
 
 import org.junit.Test;
 
diff --git a/settings.gradle b/settings.gradle
index 0b508f2..67afe1b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-include ':app', ':toasterlibrary'
+include ':app', ':baatolibrary'
 rootProject.name='OSM Navigation App'
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/responses/ReverseGeoCodeResponse.java b/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/responses/ReverseGeoCodeResponse.java
deleted file mode 100644
index d1e8e18..0000000
--- a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/responses/ReverseGeoCodeResponse.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.kathmandulivinglabs.navigationlibrary.responses;
-
-public class ReverseGeoCodeResponse {
-}