diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b8673c1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/.idea
+/vendor/
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
deleted file mode 100644
index 11c3719..0000000
--- a/.idea/deployment.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData">
-    <serverData>
-      <paths name="WPL">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/easy-yelp.iml b/.idea/easy-yelp.iml
deleted file mode 100644
index c956989..0000000
--- a/.idea/easy-yelp.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 146ab09..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
-      <option name="processCode" value="true" />
-      <option name="processLiterals" value="true" />
-      <option name="processComments" value="true" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index ba06252..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/easy-yelp.iml" filepath="$PROJECT_DIR$/.idea/easy-yelp.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
deleted file mode 100644
index 30b4799..0000000
--- a/.idea/php.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.2" />
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 5b91372..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="a9ddc40c-139c-431f-b539-a130d5fcd8a2" name="Default" comment="" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="yelp.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/yelp.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="630">
-              <caret line="215" column="10" lean-forward="true" selection-start-line="215" selection-start-column="10" selection-end-line="215" selection-end-column="10" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="business-reviews.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tests/business-reviews.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="338">
-              <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="208">
-                <caret line="8" column="34" lean-forward="true" selection-start-line="8" selection-start-column="34" selection-end-line="8" selection-end-column="34" />
-                <folding />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="LICENSE" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/LICENSE">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="364">
-              <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="business-search.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tests/business-search.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="390">
-              <caret line="15" column="20" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="15" selection-end-column="20" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="business-details.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tests/business-details.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="52">
-              <caret line="2" column="26" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="26" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>id</find>
-      <find>int</find>
-    </findStrings>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/tests/get-categories.php" />
-        <option value="$PROJECT_DIR$/tests/get-events.php" />
-        <option value="$PROJECT_DIR$/tests/get-events-details.php" />
-        <option value="$PROJECT_DIR$/tests/get-category-details.php" />
-        <option value="$PROJECT_DIR$/tests/get-featured-events.php" />
-        <option value="$PROJECT_DIR$/tests/get-featured-event.php" />
-        <option value="$PROJECT_DIR$/tests/business-search.php" />
-        <option value="$PROJECT_DIR$/tests/business-details.php" />
-        <option value="$PROJECT_DIR$/tests/get-event-details.php" />
-        <option value="$PROJECT_DIR$/tests/business-reviews.php" />
-        <option value="$PROJECT_DIR$/src/yelp.php" />
-        <option value="$PROJECT_DIR$/README.md" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="100" />
-    <option name="y" value="20" />
-    <option name="width" value="1400" />
-    <option name="height" value="820" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>Bitwise operation issuesJavaScript</id>
-          </State>
-          <State>
-            <id>Code SmellPHP</id>
-          </State>
-          <State>
-            <id>Code style issuesJavaScript</id>
-          </State>
-          <State>
-            <id>Flow type checkerJavaScript</id>
-          </State>
-          <State>
-            <id>GeneralJavaScript</id>
-          </State>
-          <State>
-            <id>HTML</id>
-          </State>
-          <State>
-            <id>Internationalization issues</id>
-          </State>
-          <State>
-            <id>JavaScript</id>
-          </State>
-          <State>
-            <id>Node.jsJavaScript</id>
-          </State>
-          <State>
-            <id>PHP</id>
-          </State>
-          <State>
-            <id>PHPDocPHP</id>
-          </State>
-          <State>
-            <id>Potentially confusing code constructsJavaScript</id>
-          </State>
-          <State>
-            <id>Probable bugsJavaScript</id>
-          </State>
-          <State>
-            <id>Probable bugsPHP</id>
-          </State>
-          <State>
-            <id>SQL</id>
-          </State>
-          <State>
-            <id>Spelling</id>
-          </State>
-          <State>
-            <id>Type compatibilityPHP</id>
-          </State>
-          <State>
-            <id>TypeScript</id>
-          </State>
-          <State>
-            <id>UndefinedPHP</id>
-          </State>
-          <State>
-            <id>XML</id>
-          </State>
-          <State>
-            <id>XPath</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>SpellCheckingInspection</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scratches" />
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="easy-yelp" type="b2602c69:ProjectViewProjectNode" />
-              <item name="easy-yelp" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="settings.editor.selected.configurable" value="Errors" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="I:\projects\github\easy-yelp\tests" />
-    </key>
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="a9ddc40c-139c-431f-b539-a130d5fcd8a2" name="Default" comment="" />
-      <created>1546515739968</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1546515739968</updated>
-      <workItem from="1546515742561" duration="5934000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="5934000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager />
-    <watches-manager />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/tests/get-featured-event.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="104">
-          <caret line="4" column="13" lean-forward="true" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/get-categories.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="156">
-          <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/get-event-details.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="52">
-          <caret line="2" column="15" lean-forward="true" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/get-events.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="52">
-          <caret line="2" column="22" lean-forward="false" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/get-category-details.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="17" column="62" lean-forward="false" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="62" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/business-details.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="52">
-          <caret line="2" column="26" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/business-search.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="15" column="20" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="15" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/LICENSE">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="364">
-          <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/business-reviews.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="338">
-          <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/yelp.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="630">
-          <caret line="215" column="10" lean-forward="true" selection-start-line="215" selection-start-column="10" selection-end-line="215" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="208">
-            <caret line="8" column="34" lean-forward="true" selection-start-line="8" selection-start-column="34" selection-end-line="8" selection-end-column="34" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 9aa6da2..5f5ec47 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ require 'yelp.php';
 If you're using composer or autoloader then you don't need to include it manually. You just need to configure your autoloader tool.
 
 ```php
-$yelp = new Yelp('YOUR_TOKEN');
+$yelp = new EasyYelp\Yelp('YOUR_API_TOKEN');
 $businesses = $yelp->businessSearch([
     'location' => 'Los Angeles, CA',
     'price' => '1,2,3',
@@ -89,6 +89,9 @@ $alias = 'blahblah';
 $request = [];
 $yelp->categoryDetails($alias, $request)->getArray();
 ```
+### Examples
+You can check tests directory files to see some examples for using API methods.
+
 ### Errors
 To check if you received an error from Yelp API or not you can use following functions.
 ```php
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..ca59597
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "hoseinrafiei/easy-yelp",
+    "description": "A light-weight PHP Client for Yelp Fusion API",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Hosein Rafiei",
+            "email": "hoseinrafiei@gmail.com"
+        }
+    ],
+    "require": {
+      "php": ">=7.0.0"
+    },
+    "autoload": {
+      "psr-0": {
+        "HoseinRafiei": "src/"
+      }
+    }
+}
diff --git a/src/yelp.php b/src/EasyYelp/yelp.php
similarity index 81%
rename from src/yelp.php
rename to src/EasyYelp/yelp.php
index a5bb070..1d67790 100644
--- a/src/yelp.php
+++ b/src/EasyYelp/yelp.php
@@ -1,9 +1,11 @@
 <?php
+namespace EasyYelp;
+
 /**
  * Yelp API Client
  *
- * @author Hossein R. <hoseinrafiei@gmail.com>
- * @class Yelp
+ * @author Hosein Rafiei <hoseinrafiei@gmail.com>
+ * @class EasyYelp
  * @version	1.0.0
  */
 class Yelp
@@ -27,7 +29,7 @@ class Yelp
     private $token;
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param string $token
      */
     public function __construct(string $token)
@@ -36,7 +38,7 @@ public function __construct(string $token)
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param array $args
      * @return Yelp
      */
@@ -46,7 +48,7 @@ public function businessSearch(array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param array $args
      * @return Yelp
      */
@@ -56,7 +58,7 @@ public function businessPhoneSearch(array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param string $transactionType
      * @param array $args
      * @return Yelp
@@ -67,7 +69,7 @@ public function transactionSearch(string $transactionType = 'delivery', array $a
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param string $id
      * @param array $args
      * @return Yelp
@@ -78,7 +80,7 @@ public function businessDetails(string $id, array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param array $args
      * @return Yelp
      */
@@ -88,7 +90,7 @@ public function businessMatch(array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param string $id
      * @param array $args
      * @return Yelp
@@ -99,7 +101,7 @@ public function businessReviews(string $id, array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param array $args
      * @return Yelp
      */
@@ -109,7 +111,7 @@ public function autocomplete(array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param array $args
      * @return Yelp
      */
@@ -119,7 +121,7 @@ public function events(array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param string $id
      * @param array $args
      * @return Yelp
@@ -130,7 +132,7 @@ public function eventDetails(string $id, array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param array $args
      * @return Yelp
      */
@@ -140,7 +142,7 @@ public function featuredEvent(array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param array $args
      * @return Yelp
      */
@@ -150,7 +152,7 @@ public function categories(array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param string $alias
      * @param array $args
      * @return Yelp
@@ -161,7 +163,7 @@ public function categoryDetails(string $alias, array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @return array
      */
     public function getArray()
@@ -170,7 +172,7 @@ public function getArray()
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @return array
      */
     public function getObject()
@@ -179,8 +181,8 @@ public function getObject()
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
-     * @param array|stdClass $response
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
+     * @param array|\stdClass $response
      * @return boolean
      */
     public function hasError($response = NULL)
@@ -194,8 +196,8 @@ public function hasError($response = NULL)
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
-     * @param array|stdClass $response
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
+     * @param array|\stdClass $response
      * @return string
      */
     public function getError($response = NULL)
@@ -212,7 +214,7 @@ public function getError($response = NULL)
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param string $route
      * @param array $args
      * @return Yelp
@@ -223,7 +225,7 @@ protected function _postRequest(string $route, array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param string $route
      * @param array $args
      * @return Yelp
@@ -234,7 +236,7 @@ protected function _getRequest(string $route, array $args = array())
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param string $route
      * @param array $args
      * @param string $method
@@ -283,7 +285,7 @@ protected function _call(string $route, array $args = array(), string $method =
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @param string $route
      * @return string
      */
@@ -293,7 +295,7 @@ protected function _url(string $route)
     }
 
     /**
-     * @author Hossein R. <hoseinrafiei@gmail.com>
+     * @author Hosein Rafiei <hoseinrafiei@gmail.com>
      * @return string
      */
     protected function _getTokenHeader()
diff --git a/tests/business-details.php b/tests/business-details.php
index 3e12c2b..5e3e0b6 100644
--- a/tests/business-details.php
+++ b/tests/business-details.php
@@ -1,12 +1,12 @@
 <?php
 // Yelp Client
-require '../src/yelp.php';
+require '../src/EasyYelp/yelp.php';
 
 // Telp Token
 $token = 'PUT_YOUR_TOKEN_HERE';
 
 // Yelp Instance
-$yelp = new Yelp($token);
+$yelp = new EasyYelp\Yelp($token);
 
 // Get Yelp Businesses
 $businessId = 'gLn9MKqseb1leWZOWqD54g';
diff --git a/tests/business-reviews.php b/tests/business-reviews.php
index 4d149d1..ca3fbb2 100644
--- a/tests/business-reviews.php
+++ b/tests/business-reviews.php
@@ -1,12 +1,12 @@
 <?php
 // Yelp Client
-require '../src/yelp.php';
+require '../src/EasyYelp/yelp.php';
 
 // Telp Token
 $token = 'PUT_YOUR_TOKEN_HERE';
 
 // Yelp Instance
-$yelp = new Yelp($token);
+$yelp = new EasyYelp\Yelp($token);
 
 // Get Yelp Businesses
 $businessId = 'gLn9MKqseb1leWZOWqD54g';
diff --git a/tests/business-search.php b/tests/business-search.php
index 9fae48c..aedbd81 100644
--- a/tests/business-search.php
+++ b/tests/business-search.php
@@ -1,12 +1,12 @@
 <?php
 // Yelp Client
-require '../src/yelp.php';
+require '../src/EasyYelp/yelp.php';
 
 // Telp Token
 $token = 'PUT_YOUR_TOKEN_HERE';
 
 // Yelp Instance
-$yelp = new Yelp($token);
+$yelp = new EasyYelp\Yelp($token);
 
 // Get Yelp Businesses
 $request = [
diff --git a/tests/get-categories.php b/tests/get-categories.php
index 14c75c1..74d34d7 100644
--- a/tests/get-categories.php
+++ b/tests/get-categories.php
@@ -1,12 +1,12 @@
 <?php
 // Yelp Client
-require '../src/yelp.php';
+require '../src/EasyYelp/yelp.php';
 
 // Telp Token
 $token = 'PUT_YOUR_TOKEN_HERE';
 
 // Yelp Instance
-$yelp = new Yelp($token);
+$yelp = new EasyYelp\Yelp($token);
 
 // Get Yelp Categories
 $response = $yelp->categories()->getArray();
diff --git a/tests/get-category-details.php b/tests/get-category-details.php
index 11f3a07..054756c 100644
--- a/tests/get-category-details.php
+++ b/tests/get-category-details.php
@@ -1,12 +1,12 @@
 <?php
 // Yelp Client
-require '../src/yelp.php';
+require '../src/EasyYelp/yelp.php';
 
 // Telp Token
 $token = 'PUT_YOUR_TOKEN_HERE';
 
 // Yelp Instance
-$yelp = new Yelp($token);
+$yelp = new EasyYelp\Yelp($token);
 
 // Get Yelp Categories
 $response = $yelp->categories()->getArray();
diff --git a/tests/get-event-details.php b/tests/get-event-details.php
index ca9ff15..cddae82 100644
--- a/tests/get-event-details.php
+++ b/tests/get-event-details.php
@@ -1,12 +1,12 @@
 <?php
 // Yelp Client
-require '../src/yelp.php';
+require '../src/EasyYelp/yelp.php';
 
 // Telp Token
 $token = 'PUT_YOUR_TOKEN_HERE';
 
 // Yelp Instance
-$yelp = new Yelp($token);
+$yelp = new EasyYelp\Yelp($token);
 
 // Get Yelp Event
 $eventId = 'san-francisco-yelp-10-year-anniversary-celebration';
diff --git a/tests/get-events.php b/tests/get-events.php
index a6be5cd..e91e5c7 100644
--- a/tests/get-events.php
+++ b/tests/get-events.php
@@ -1,12 +1,12 @@
 <?php
 // Yelp Client
-require '../src/yelp.php';
+require '../src/EasyYelp/yelp.php';
 
 // Telp Token
 $token = 'PUT_YOUR_TOKEN_HERE';
 
 // Yelp Instance
-$yelp = new Yelp($token);
+$yelp = new EasyYelp\Yelp($token);
 
 // Get Yelp Events
 $response = $yelp->events()->getArray();
diff --git a/tests/get-featured-event.php b/tests/get-featured-event.php
index 3ef21f9..6109fb1 100644
--- a/tests/get-featured-event.php
+++ b/tests/get-featured-event.php
@@ -1,12 +1,12 @@
 <?php
 // Yelp Client
-require '../src/yelp.php';
+require '../src/EasyYelp/yelp.php';
 
 // Telp Token
 $token = 'PUT_YOUR_TOKEN_HERE';
 
 // Yelp Instance
-$yelp = new Yelp($token);
+$yelp = new EasyYelp\Yelp($token);
 
 // Get Yelp Featured Event
 $request = [