diff --git a/[esx]/async/README.md b/[esx]/async/README.md
index 12efddbd5..b1b6e94de 100644
--- a/[esx]/async/README.md
+++ b/[esx]/async/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # esx-legacy
 Consolidated esx-legacy files into one repo for easy download since we will not support it
 =======
@@ -39,4 +38,3 @@ Async.series(tasks, function(results)
 	print(json.encode(results))
 end)
 ```
->>>>>>> async/master
diff --git a/[esx]/cron/README.md b/[esx]/cron/README.md
index a94890463..9e1979ec4 100644
--- a/[esx]/cron/README.md
+++ b/[esx]/cron/README.md
@@ -4,17 +4,17 @@
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/cron
+fvm install --save --folder=esx esx-legacy/cron
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/cron cron
+git clone https://github.com/esx-legacy/cron cron
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/cron/archive/master.zip
+- Download https://github.com/esx-legacy/cron/archive/master.zip
 - Put it in your resource directory
 
 
diff --git a/[esx]/esx_identity/README.md b/[esx]/esx_identity/README.md
index a310d94bc..0aa1af712 100644
--- a/[esx]/esx_identity/README.md
+++ b/[esx]/esx_identity/README.md
@@ -2,25 +2,25 @@
 
 ## Requirements
 * Dependencies For Full Functionality
-  * [esx_skin](https://github.com/ESX-Org/esx_skin)
-  * [esx_policejob](https://github.com/ESX-Org/esx_policejob)
-  * [esx_society](https://github.com/ESX-Org/esx_society)
+  * [esx_skin](https://github.com/esx-legacy/esx_skin)
+  * [esx_policejob](https://github.com/esx-legacy/esx_policejob)
+  * [esx_society](https://github.com/esx-legacy/esx_society)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_identity
+fvm install --save --folder=esx esx-legacy/esx_identity
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_identity [esx]/esx_identity
+git clone https://github.com/esx-legacy/esx_identity [esx]/esx_identity
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_identity/archive/master.zip
+- Download https://github.com/esx-legacy/esx_identity/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx]/esx_menu_dialog/README.md b/[esx]/esx_menu_dialog/README.md
index a6af27e7f..5694ad112 100644
--- a/[esx]/esx_menu_dialog/README.md
+++ b/[esx]/esx_menu_dialog/README.md
@@ -5,17 +5,17 @@ Simple script used for inputs.
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_menu_dialog
+fvm install --save --folder=esx esx-legacy/esx_menu_dialog
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_menu_dialog [esx]/esx_menu_dialog
+git clone https://github.com/esx-legacy/esx_menu_dialog [esx]/esx_menu_dialog
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_menu_dialog/archive/master.zip
+- Download https://github.com/esx-legacy/esx_menu_dialog/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx]/esx_menu_list/README.md b/[esx]/esx_menu_list/README.md
index 7f8d28029..967c59f79 100644
--- a/[esx]/esx_menu_list/README.md
+++ b/[esx]/esx_menu_list/README.md
@@ -5,17 +5,17 @@ Advanced menu inputs for ESX
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_menu_list
+fvm install --save --folder=esx esx-legacy/esx_menu_list
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_menu_list [esx]/esx_menu_list
+git clone https://github.com/esx-legacy/esx_menu_list [esx]/esx_menu_list
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_menu_list/archive/master.zip
+- Download https://github.com/esx-legacy/esx_menu_list/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx]/esx_skin/README.md b/[esx]/esx_skin/README.md
index 6b73bdacb..18d21eb97 100644
--- a/[esx]/esx_skin/README.md
+++ b/[esx]/esx_skin/README.md
@@ -1,23 +1,23 @@
 # esx_skin
 
 ## Requirements
-- [skinchanger](https://github.com/ESX-Org/skinchanger)
+- [skinchanger](https://github.com/esx-legacy/skinchanger)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_skin
+fvm install --save --folder=esx esx-legacy/esx_skin
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_skin [esx]/esx_skin
+git clone https://github.com/esx-legacy/esx_skin [esx]/esx_skin
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_skin/archive/master.zip
+- Download https://github.com/esx-legacy/esx_skin/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx]/skinchanger/README.md b/[esx]/skinchanger/README.md
index 6bf24f50c..2254a9f69 100644
--- a/[esx]/skinchanger/README.md
+++ b/[esx]/skinchanger/README.md
@@ -6,17 +6,17 @@ skinchanger is a resource that makes it easy to set and get player ped clothing.
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save esx-org/skinchanger
+fvm install --save esx-legacy/skinchanger
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/skinchanger skinchanger
+git clone https://github.com/esx-legacy/skinchanger skinchanger
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/skinchanger/archive/master.zip
+- Download https://github.com/esx-legacy/skinchanger/archive/master.zip
 
 ## Installation
 - Add this to your `server.cfg`:
diff --git a/[esx_addons]/esx_addonaccount/README.md b/[esx_addons]/esx_addonaccount/README.md
index 0b8a9acc5..05b3fc714 100644
--- a/[esx_addons]/esx_addonaccount/README.md
+++ b/[esx_addons]/esx_addonaccount/README.md
@@ -4,17 +4,17 @@
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_addonaccount
+fvm install --save --folder=esx esx-legacy/esx_addonaccount
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_addonaccount [esx]/esx_addonaccount
+git clone https://github.com/esx-legacy/esx_addonaccount [esx]/esx_addonaccount
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_addonaccount/archive/master.zip
+- Download https://github.com/esx-legacy/esx_addonaccount/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_addoninventory/README.md b/[esx_addons]/esx_addoninventory/README.md
index bb901bc52..179fabf58 100644
--- a/[esx_addons]/esx_addoninventory/README.md
+++ b/[esx_addons]/esx_addoninventory/README.md
@@ -4,17 +4,17 @@
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_addoninventory
+fvm install --save --folder=esx esx-legacy/esx_addoninventory
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_addoninventory [esx]/esx_addoninventory
+git clone https://github.com/esx-legacy/esx_addoninventory [esx]/esx_addoninventory
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_addoninventory/archive/master.zip
+- Download https://github.com/esx-legacy/esx_addoninventory/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_animations/README.md b/[esx_addons]/esx_animations/README.md
index 55451cd6c..6d794bcd7 100644
--- a/[esx_addons]/esx_animations/README.md
+++ b/[esx_addons]/esx_animations/README.md
@@ -4,17 +4,17 @@
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_animations
+fvm install --save --folder=esx esx-legacy/esx_animations
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_animations [esx]/esx_animations
+git clone https://github.com/esx-legacy/esx_animations [esx]/esx_animations
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_animations/archive/master.zip
+- Download https://github.com/esx-legacy/esx_animations/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_bankerjob/README.md b/[esx_addons]/esx_bankerjob/README.md
index 545fdb0e0..15ba23262 100644
--- a/[esx_addons]/esx_bankerjob/README.md
+++ b/[esx_addons]/esx_bankerjob/README.md
@@ -2,25 +2,25 @@
 
 ## Requirements
 
-- [cron](https://github.com/ESX-Org/cron)
-- [esx_addonaccount](https://github.com/ESX-Org/esx_addonaccount)
-- [esx_society](https://github.com/ESX-Org/esx_society)
+- [cron](https://github.com/esx-legacy/cron)
+- [esx_addonaccount](https://github.com/esx-legacy/esx_addonaccount)
+- [esx_society](https://github.com/esx-legacy/esx_society)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_bankerjob
+fvm install --save --folder=esx esx-legacy/esx_bankerjob
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_bankerjob [esx]/esx_bankerjob
+git clone https://github.com/esx-legacy/esx_bankerjob [esx]/esx_bankerjob
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_bankerjob/archive/master.zip
+- Download https://github.com/esx-legacy/esx_bankerjob/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_barbershop/README.md b/[esx_addons]/esx_barbershop/README.md
index dbd5cd6e5..dcf072059 100644
--- a/[esx_addons]/esx_barbershop/README.md
+++ b/[esx_addons]/esx_barbershop/README.md
@@ -1,23 +1,23 @@
 # esx_barbershop
 
 ## Requirements
-- [esx_skin](https://github.com/ESX-Org/esx_skin)
+- [esx_skin](https://github.com/esx-legacy/esx_skin)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_barbershop
+fvm install --save --folder=esx esx-legacy/esx_barbershop
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_barbershop [esx]/esx_barbershop
+git clone https://github.com/esx-legacy/esx_barbershop [esx]/esx_barbershop
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_barbershop/archive/master.zip
+- Download https://github.com/esx-legacy/esx_barbershop/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_basicneeds/README.md b/[esx_addons]/esx_basicneeds/README.md
index 0a3bfe24c..8122cd14c 100644
--- a/[esx_addons]/esx_basicneeds/README.md
+++ b/[esx_addons]/esx_basicneeds/README.md
@@ -2,23 +2,23 @@
 This script implements hunger and thirst status, they can be increased when eating bread or drinking water.
 
 ## Requirements
-- [esx_status](https://github.com/ESX-Org/esx_status)
+- [esx_status](https://github.com/esx-legacy/esx_status)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_basicneeds
+fvm install --save --folder=esx esx-legacy/esx_basicneeds
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_basicneeds [esx]/esx_basicneeds
+git clone https://github.com/esx-legacy/esx_basicneeds [esx]/esx_basicneeds
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_basicneeds/archive/master.zip
+- Download https://github.com/esx-legacy/esx_basicneeds/archive/master.zip
 - Put it in the `[esx]` directory
 
 
diff --git a/[esx_addons]/esx_billing/README.md b/[esx_addons]/esx_billing/README.md
index dc3999311..2af4d3510 100644
--- a/[esx_addons]/esx_billing/README.md
+++ b/[esx_addons]/esx_billing/README.md
@@ -8,17 +8,17 @@ There is a developer server event available in order to register bills in the da
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_billing
+fvm install --save --folder=esx esx-legacy/esx_billing
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_billing [esx]/esx_billing
+git clone https://github.com/esx-legacy/esx_billing [esx]/esx_billing
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_billing/archive/master.zip
+- Download https://github.com/esx-legacy/esx_billing/archive/master.zip
 - Put it in the `[esx]` directory
 
 
diff --git a/[esx_addons]/esx_boat/README.md b/[esx_addons]/esx_boat/README.md
index 4edd62007..6208de58e 100644
--- a/[esx_addons]/esx_boat/README.md
+++ b/[esx_addons]/esx_boat/README.md
@@ -2,23 +2,23 @@
 This resource for ESX adds boat shops and boat garages around San Andreas, the island has been populated with boat garages, and comes defaulted with one boat shop.
 
 ## Requirements
-- [esx_vehicleshop](https://github.com/ESX-Org/esx_vehicleshop)
+- [esx_vehicleshop](https://github.com/esx-legacy/esx_vehicleshop)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_boat
+fvm install --save --folder=esx esx-legacy/esx_boat
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_boat [esx]/esx_boat
+git clone https://github.com/esx-legacy/esx_boat [esx]/esx_boat
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_boat/archive/master.zip
+- Download https://github.com/esx-legacy/esx_boat/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_clotheshop/README.md b/[esx_addons]/esx_clotheshop/README.md
index 18a9e4fd8..2fdf84380 100644
--- a/[esx_addons]/esx_clotheshop/README.md
+++ b/[esx_addons]/esx_clotheshop/README.md
@@ -1,23 +1,23 @@
 # esx_clotheshop
 
 ## Requirements
-- [esx_skin](https://github.com/ESX-Org/esx_skin)
+- [esx_skin](https://github.com/esx-legacy/esx_skin)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_clotheshop
+fvm install --save --folder=esx esx-legacy/esx_clotheshop
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_clotheshop [esx]/esx_clotheshop
+git clone https://github.com/esx-legacy/esx_clotheshop [esx]/esx_clotheshop
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_clotheshop/archive/master.zip
+- Download https://github.com/esx-legacy/esx_clotheshop/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_cruisecontrol/README.md b/[esx_addons]/esx_cruisecontrol/README.md
index 0cc1249f7..b56c8c8c7 100644
--- a/[esx_addons]/esx_cruisecontrol/README.md
+++ b/[esx_addons]/esx_cruisecontrol/README.md
@@ -12,4 +12,4 @@ fvm install --save esx_cruisecontrol
 ```
 
 **Using Git Releases**
-Download the latest release : https://github.com/ESX-Org/esx_cruisecontrol/releases
+Download the latest release : https://github.com/esx-legacy/esx_cruisecontrol/releases
diff --git a/[esx_addons]/esx_datastore/README.md b/[esx_addons]/esx_datastore/README.md
index 21b66e58e..d6a895a39 100644
--- a/[esx_addons]/esx_datastore/README.md
+++ b/[esx_addons]/esx_datastore/README.md
@@ -4,17 +4,17 @@
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_datastore
+fvm install --save --folder=esx esx-legacy/esx_datastore
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_datastore [esx]/esx_datastore
+git clone https://github.com/esx-legacy/esx_datastore [esx]/esx_datastore
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_datastore/archive/master.zip
+- Download https://github.com/esx-legacy/esx_datastore/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_drugs/README.md b/[esx_addons]/esx_drugs/README.md
index dce4a7158..fb24e218f 100644
--- a/[esx_addons]/esx_drugs/README.md
+++ b/[esx_addons]/esx_drugs/README.md
@@ -4,23 +4,23 @@ Adds the well-known drugs for the people who want to make quick money. Weed Fiel
 
 ## Requirements
 * ESX License Support
-  * [esx_license](https://github.com/ESX-Org/esx_license)
+  * [esx_license](https://github.com/esx-legacy/esx_license)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_drugs
+fvm install --save --folder=esx esx-legacy/esx_drugs
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_drugs [esx]/esx_drugs
+git clone https://github.com/esx-legacy/esx_drugs [esx]/esx_drugs
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_drugs/archive/master.zip
+- Download https://github.com/esx-legacy/esx_drugs/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_holdup/README.md b/[esx_addons]/esx_holdup/README.md
index ecb99ac1e..f48dab040 100644
--- a/[esx_addons]/esx_holdup/README.md
+++ b/[esx_addons]/esx_holdup/README.md
@@ -2,23 +2,23 @@
 This resource for ESX adds stores around the island for criminals to rob!
 
 ### Requirements
-- [esx_policejob](https://github.com/ESX-Org/esx_policejob)
+- [esx_policejob](https://github.com/esx-legacy/esx_policejob)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_holdup
+fvm install --save --folder=esx esx-legacy/esx_holdup
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_holdup [esx]/esx_holdup
+git clone https://github.com/esx-legacy/esx_holdup [esx]/esx_holdup
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_holdup/archive/master.zip
+- Download https://github.com/esx-legacy/esx_holdup/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_jobs/README.md b/[esx_addons]/esx_jobs/README.md
index 9bb5865ef..2a9eb858f 100644
--- a/[esx_addons]/esx_jobs/README.md
+++ b/[esx_addons]/esx_jobs/README.md
@@ -2,8 +2,8 @@
 
 ## Requirements
 
-- [esx_addonaccount](https://github.com/ESX-Org/esx_addonaccount)
-- [esx_skin](https://github.com/ESX-Org/esx_skin)
+- [esx_addonaccount](https://github.com/esx-legacy/esx_addonaccount)
+- [esx_skin](https://github.com/esx-legacy/esx_skin)
 
 ### Features
 
diff --git a/[esx_addons]/esx_license/README.md b/[esx_addons]/esx_license/README.md
index 90cee8f9e..bea42f967 100644
--- a/[esx_addons]/esx_license/README.md
+++ b/[esx_addons]/esx_license/README.md
@@ -4,17 +4,17 @@
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_license
+fvm install --save --folder=esx esx-legacy/esx_license
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_license [esx]/esx_license
+git clone https://github.com/esx-legacy/esx_license [esx]/esx_license
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_license/archive/master.zip
+- Download https://github.com/esx-legacy/esx_license/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_lscustom/README.md b/[esx_addons]/esx_lscustom/README.md
index dd0044de5..69dc41477 100644
--- a/[esx_addons]/esx_lscustom/README.md
+++ b/[esx_addons]/esx_lscustom/README.md
@@ -2,7 +2,7 @@
 
 ## Requirements
 
-- [esx_vehicleshop](https://github.com/ESX-Org/esx_vehicleshop)
+- [esx_vehicleshop](https://github.com/esx-legacy/esx_vehicleshop)
 
 ## Legal
 
diff --git a/[esx_addons]/esx_mechanicjob/README.md b/[esx_addons]/esx_mechanicjob/README.md
index 9e3cbbbca..544db3e85 100644
--- a/[esx_addons]/esx_mechanicjob/README.md
+++ b/[esx_addons]/esx_mechanicjob/README.md
@@ -6,24 +6,24 @@
   * No need to download another resource
 
 * Player management (billing and boss actions)
-  * [esx_society](https://github.com/ESX-Org/esx_society)
-  * [esx_billing](https://github.com/ESX-Org/esx_billing)
+  * [esx_society](https://github.com/esx-legacy/esx_society)
+  * [esx_billing](https://github.com/esx-legacy/esx_billing)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_mechanicjob
+fvm install --save --folder=esx esx-legacy/esx_mechanicjob
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_mechanicjob [esx]/esx_mechanicjob
+git clone https://github.com/esx-legacy/esx_mechanicjob [esx]/esx_mechanicjob
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_mechanicjob/archive/master.zip
+- Download https://github.com/esx-legacy/esx_mechanicjob/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_optionalneeds/README.md b/[esx_addons]/esx_optionalneeds/README.md
index 5271675b7..996dd9e3f 100644
--- a/[esx_addons]/esx_optionalneeds/README.md
+++ b/[esx_addons]/esx_optionalneeds/README.md
@@ -2,14 +2,14 @@
 ESX Optional Needs
 
 [REQUIREMENTS]
-- esx_status https://github.com/ESX-Org/esx_status
+- esx_status https://github.com/esx-legacy/esx_status
 
 [INSTALLATION]
 
 1) CD in your resources folder
 2) Clone the repository
 ```
-git clone https://github.com/ESX-Org/esx_optionalneeds [esx]/esx_optionalneeds
+git clone https://github.com/esx-legacy/esx_optionalneeds [esx]/esx_optionalneeds
 ```
 3) Add this in your server.cfg :
 
diff --git a/[esx_addons]/esx_phone/README.md b/[esx_addons]/esx_phone/README.md
index a533d7722..a47480cf4 100644
--- a/[esx_addons]/esx_phone/README.md
+++ b/[esx_addons]/esx_phone/README.md
@@ -7,17 +7,17 @@
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_phone
+fvm install --save --folder=esx esx-legacy/esx_phone
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_phone [esx]/esx_phone
+git clone https://github.com/esx-legacy/esx_phone [esx]/esx_phone
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_phone/archive/master.zip
+- Download https://github.com/esx-legacy/esx_phone/archive/master.zip
 - Put it in the `[esx]` directory
 
 - Import `esx_phone.sql` in your database
diff --git a/[esx_addons]/esx_policejob/README.md b/[esx_addons]/esx_policejob/README.md
index 94be092a0..64a3f04b7 100644
--- a/[esx_addons]/esx_policejob/README.md
+++ b/[esx_addons]/esx_policejob/README.md
@@ -4,41 +4,41 @@ This resource for ESX adds police armories, vehicle garages and ability for cops
 
 ### Requirements
 * Auto mode
-  * [esx_billing](https://github.com/ESX-Org/esx_billing)
-  * [esx_vehicleshop](https://github.com/ESX-Org/esx_vehicleshop)
+  * [esx_billing](https://github.com/esx-legacy/esx_billing)
+  * [esx_vehicleshop](https://github.com/esx-legacy/esx_vehicleshop)
 
 * Player management (boss actions and armory with buyable weapons)
-  * [esx_addoninventory](https://github.com/ESX-Org/esx_addoninventory)
-  * [esx_datastore](https://github.com/ESX-Org/esx_datastore)
-  * [esx_society](https://github.com/ESX-Org/esx_society)
+  * [esx_addoninventory](https://github.com/esx-legacy/esx_addoninventory)
+  * [esx_datastore](https://github.com/esx-legacy/esx_datastore)
+  * [esx_society](https://github.com/esx-legacy/esx_society)
 
 * ESX Identity Support
-  * [esx_identity](https://github.com/ESX-Org/esx_identity)
+  * [esx_identity](https://github.com/esx-legacy/esx_identity)
 
 * ESX License Support
-  * [esx_license](https://github.com/ESX-Org/esx_license)
+  * [esx_license](https://github.com/esx-legacy/esx_license)
 
 * ESX Service Support
-  * [esx_service](https://github.com/ESX-Org/esx_service)
+  * [esx_service](https://github.com/esx-legacy/esx_service)
 
 * ESX Status Support
-  * [esx_status](https://github.com/ESX-Org/esx_status)
+  * [esx_status](https://github.com/esx-legacy/esx_status)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_policejob
+fvm install --save --folder=esx esx-legacy/esx_policejob
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_policejob [esx]/esx_policejob
+git clone https://github.com/esx-legacy/esx_policejob [esx]/esx_policejob
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_policejob/archive/master.zip
+- Download https://github.com/esx-legacy/esx_policejob/archive/master.zip
 - Put it in the `[esx]` directory
 
 
diff --git a/[esx_addons]/esx_property/README.md b/[esx_addons]/esx_property/README.md
index 5f2838040..1d70c5111 100644
--- a/[esx_addons]/esx_property/README.md
+++ b/[esx_addons]/esx_property/README.md
@@ -2,28 +2,28 @@
 
 ### Requirements
 
-- [async](https://github.com/ESX-Org/async)
-- [instance](https://github.com/ESX-Org/instance)
-- [cron](https://github.com/ESX-Org/cron)
-- [esx_addonaccount](https://github.com/ESX-Org/esx_addonaccount)
-- [esx_addoninventory](https://github.com/ESX-Org/esx_addoninventory)
-- [esx_datastore](https://github.com/ESX-Org/esx_datastore)
+- [async](https://github.com/esx-legacy/async)
+- [instance](https://github.com/esx-legacy/instance)
+- [cron](https://github.com/esx-legacy/cron)
+- [esx_addonaccount](https://github.com/esx-legacy/esx_addonaccount)
+- [esx_addoninventory](https://github.com/esx-legacy/esx_addoninventory)
+- [esx_datastore](https://github.com/esx-legacy/esx_datastore)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_property
+fvm install --save --folder=esx esx-legacy/esx_property
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_property [esx]/esx_property
+git clone https://github.com/esx-legacy/esx_property [esx]/esx_property
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_property/archive/master.zip
+- Download https://github.com/esx-legacy/esx_property/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_realestateagentjob/README.md b/[esx_addons]/esx_realestateagentjob/README.md
index 60749b718..a7ba2bf23 100644
--- a/[esx_addons]/esx_realestateagentjob/README.md
+++ b/[esx_addons]/esx_realestateagentjob/README.md
@@ -1,25 +1,25 @@
 # esx_realestateagentjob
 
 ## Requirements
-- [esx_addonaccount](https://github.com/ESX-Org/esx_addonaccount)
-- [esx_property](https://github.com/ESX-Org/esx_property)
-- [esx_society](https://github.com/ESX-Org/esx_society)
+- [esx_addonaccount](https://github.com/esx-legacy/esx_addonaccount)
+- [esx_property](https://github.com/esx-legacy/esx_property)
+- [esx_society](https://github.com/esx-legacy/esx_society)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_realestateagentjob
+fvm install --save --folder=esx esx-legacy/esx_realestateagentjob
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_realestateagentjob [esx]/esx_realestateagentjob
+git clone https://github.com/esx-legacy/esx_realestateagentjob [esx]/esx_realestateagentjob
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_realestateagentjob/archive/master.zip
+- Download https://github.com/esx-legacy/esx_realestateagentjob/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_service/README.md b/[esx_addons]/esx_service/README.md
index ffab4b99f..5457ceff9 100644
--- a/[esx_addons]/esx_service/README.md
+++ b/[esx_addons]/esx_service/README.md
@@ -4,17 +4,17 @@
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_service
+fvm install --save --folder=esx esx-legacy/esx_service
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_service [esx]/esx_service
+git clone https://github.com/esx-legacy/esx_service [esx]/esx_service
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_service/archive/master.zip
+- Download https://github.com/esx-legacy/esx_service/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_shops/README.md b/[esx_addons]/esx_shops/README.md
index db0b8e801..3f593327e 100644
--- a/[esx_addons]/esx_shops/README.md
+++ b/[esx_addons]/esx_shops/README.md
@@ -4,17 +4,17 @@
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_shops
+fvm install --save --folder=esx esx-legacy/esx_shops
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_shops [esx]/esx_shops
+git clone https://github.com/esx-legacy/esx_shops [esx]/esx_shops
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_shops/archive/master.zip
+- Download https://github.com/esx-legacy/esx_shops/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_sit/README.md b/[esx_addons]/esx_sit/README.md
index ab959e154..b23cc6574 100644
--- a/[esx_addons]/esx_sit/README.md
+++ b/[esx_addons]/esx_sit/README.md
@@ -7,19 +7,19 @@ This script allow you to sit in almost every object where you should be able to,
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 
 ```
-fvm install --save --folder=esx esx-org/esx_sit
+fvm install --save --folder=esx esx-legacy/esx_sit
 ```
 
 ### Using Git
 
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_sit [esx]/esx_sit
+git clone https://github.com/esx-legacy/esx_sit [esx]/esx_sit
 ```
 
 ### Manually
 
-- Download https://github.com/ESX-Org/esx_sit/releases/latest
+- Download https://github.com/esx-legacy/esx_sit/releases/latest
 - Put it in the `resource/[esx]` directory
 
 ### Installation
diff --git a/[esx_addons]/esx_society/README.md b/[esx_addons]/esx_society/README.md
index 2b7fc2506..4a6dc303a 100644
--- a/[esx_addons]/esx_society/README.md
+++ b/[esx_addons]/esx_society/README.md
@@ -3,24 +3,24 @@
 Society management for ESX. Adds employee management (hire, fire, promote / demote, change salary), society bank accounts and money washing. It's crucial that this script gets started before all resources that utilize societies do, or else many things will go wrong.
 
 ## Requirements
-- [cron](https://github.com/ESX-Org/cron)
-- [esx_addonaccount](https://github.com/ESX-Org/esx_addonaccount)
+- [cron](https://github.com/esx-legacy/cron)
+- [esx_addonaccount](https://github.com/esx-legacy/esx_addonaccount)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_society
+fvm install --save --folder=esx esx-legacy/esx_society
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_society [esx]/esx_society
+git clone https://github.com/esx-legacy/esx_society [esx]/esx_society
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_society/archive/master.zip
+- Download https://github.com/esx-legacy/esx_society/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_status/README.md b/[esx_addons]/esx_status/README.md
index b678dc874..36a0a9e0e 100644
--- a/[esx_addons]/esx_status/README.md
+++ b/[esx_addons]/esx_status/README.md
@@ -5,7 +5,7 @@ ESX Status
 1) CD in your resources/[esx] folder
 2) Clone the repository
 ```
-git clone https://github.com/ESX-Org/esx_status esx_status
+git clone https://github.com/esx-legacy/esx_status esx_status
 ```
 3) Import esx_status.sql in your database
 4) Add this in your server.cfg :
diff --git a/[esx_addons]/esx_taxijob/README.md b/[esx_addons]/esx_taxijob/README.md
index ae3a97955..f6ae5da51 100644
--- a/[esx_addons]/esx_taxijob/README.md
+++ b/[esx_addons]/esx_taxijob/README.md
@@ -5,27 +5,27 @@ ESX Taxi Job adds driving cabs as a service, and more including NPC missions.
 ## Requirements
 
 * Auto mode
-  * [esx_service](https://github.com/ESX-Org/esx_service)
+  * [esx_service](https://github.com/esx-legacy/esx_service)
 
 * Player management (billing and boss actions)
-  * [esx_society](https://github.com/ESX-Org/esx_society)
-  * [esx_billing](https://github.com/ESX-Org/esx_billing)
+  * [esx_society](https://github.com/esx-legacy/esx_society)
+  * [esx_billing](https://github.com/esx-legacy/esx_billing)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_taxijob
+fvm install --save --folder=esx esx-legacy/esx_taxijob
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_taxijob [esx]/esx_taxijob
+git clone https://github.com/esx-legacy/esx_taxijob [esx]/esx_taxijob
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_taxijob/archive/master.zip
+- Download https://github.com/esx-legacy/esx_taxijob/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/esx_vehicleshop/README.md b/[esx_addons]/esx_vehicleshop/README.md
index bfcbad272..e9b4236e3 100644
--- a/[esx_addons]/esx_vehicleshop/README.md
+++ b/[esx_addons]/esx_vehicleshop/README.md
@@ -8,30 +8,30 @@ ESX Vehicle Shop adds an vehicle shop to the game, where employeed players can s
   * No need to download other resources
 
 * Player management (the car dealer job): billing, boss actions and more!
-  * [esx_society](https://github.com/ESX-Org/esx_society)
-  * [esx_billing](https://github.com/ESX-Org/esx_billing)
-  * [esx_addonaccount](https://github.com/ESX-Org/esx_addonaccount)
-  * [esx_addoninventory](https://github.com/ESX-Org/esx_addoninventory)
-  * [cron](https://github.com/ESX-Org/cron)
+  * [esx_society](https://github.com/esx-legacy/esx_society)
+  * [esx_billing](https://github.com/esx-legacy/esx_billing)
+  * [esx_addonaccount](https://github.com/esx-legacy/esx_addonaccount)
+  * [esx_addoninventory](https://github.com/esx-legacy/esx_addoninventory)
+  * [cron](https://github.com/esx-legacy/cron)
 
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 
 ```
-fvm install --save --folder=esx esx-org/esx_vehicleshop
+fvm install --save --folder=esx esx-legacy/esx_vehicleshop
 ```
 
 ### Using Git
 
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_vehicleshop [esx]/esx_vehicleshop
+git clone https://github.com/esx-legacy/esx_vehicleshop [esx]/esx_vehicleshop
 ```
 
 ### Manually
 
-- Download https://github.com/ESX-Org/esx_vehicleshop/archive/master.zip
+- Download https://github.com/esx-legacy/esx_vehicleshop/archive/master.zip
 - Put it in the `[esx]` directory
 
 ### Installation
diff --git a/[esx_addons]/esx_voice/README.md b/[esx_addons]/esx_voice/README.md
index 0dda188b2..c038737b7 100644
--- a/[esx_addons]/esx_voice/README.md
+++ b/[esx_addons]/esx_voice/README.md
@@ -5,17 +5,17 @@ This is a proximity voice controller script. The default control for this is `Le
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/esx_voice
+fvm install --save --folder=esx esx-legacy/esx_voice
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/esx_voice [esx]/esx_voice
+git clone https://github.com/esx-legacy/esx_voice [esx]/esx_voice
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/esx_voice/archive/master.zip
+- Download https://github.com/esx-legacy/esx_voice/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
diff --git a/[esx_addons]/instance/README.md b/[esx_addons]/instance/README.md
index 3f933b32a..7312a87a6 100644
--- a/[esx_addons]/instance/README.md
+++ b/[esx_addons]/instance/README.md
@@ -1,20 +1,23 @@
 # instance
 
+# Use the SetPlayerRoutingBucket native instead of this script
+# Native documentation: https://docs.fivem.net/natives/?_0x6504EB38
+
 ## Download & Installation
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-org/instance
+fvm install --save --folder=esx esx-legacy/instance
 ```
 
 ### Using Git
 ```
 cd resources
-git clone https://github.com/ESX-Org/instance [esx]/instance
+git clone https://github.com/esx-legacy/instance [esx]/instance
 ```
 
 ### Manually
-- Download https://github.com/ESX-Org/instance/archive/master.zip
+- Download https://github.com/esx-legacy/instance/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation