diff --git a/composer.json b/composer.json
index 9d7ca88..27d1643 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Perfacilis\\": "src/Perfacilis"
+            "Perfacilis\\Geocoder\\": "src"
         }
     }
 }
diff --git a/composer.lock b/composer.lock
index eb9a234..2dd6512 100644
--- a/composer.lock
+++ b/composer.lock
@@ -52,6 +52,9 @@
                 "psr-16",
                 "simple-cache"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/simple-cache/tree/master"
+            },
             "time": "2017-10-23T01:57:42+00:00"
         }
     ],
@@ -63,5 +66,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.1.0"
 }
diff --git a/src/Perfacilis/Geocoder/Geocoder.php b/src/Geocoder.php
similarity index 100%
rename from src/Perfacilis/Geocoder/Geocoder.php
rename to src/Geocoder.php
diff --git a/src/Perfacilis/Geocoder/Query.php b/src/Query.php
similarity index 100%
rename from src/Perfacilis/Geocoder/Query.php
rename to src/Query.php
diff --git a/src/Perfacilis/Geocoder/Result.php b/src/Result.php
similarity index 100%
rename from src/Perfacilis/Geocoder/Result.php
rename to src/Result.php