diff --git a/README.md b/README.md
index c3fc8b692d..8451a01e6f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![hacs_badge](https://img.shields.io/badge/HACS-Custom-orange.svg?style=for-the-badge)](https://github.com/custom-components/hacs)
+
 # Meross HomeAssistant component
 A full featured Homeassistant component to drive Meross devices. 
 This component is based on the underlying MerossIot library available [here](https://github.com/albertogeniola/MerossIot).
@@ -7,7 +9,9 @@ My personal goal is to make this component fully compliant with Homeassistant, s
 that it may be added as the official library to handle Meross devices. 
 However, before pushing a PullRequest to the official Homeassistant repository, I would like to share it to some users.
 In this way we can test it massively, check it for any bug and make it **robust enough** to be seamlessly integrated 
-with Homeassistant. 
+with Homeassistant.
+
+For now, the component has been integrated as a custom component into [HACS](https://custom-components.github.io/hacs/). 
 
 ## Installation & configuration
 Install it as you would do with any homeassistant custom component:
@@ -83,6 +87,9 @@ HomeAssistant best practices, in particular:
 - Refactor and improvements based on feedbacks
 
 ## Support on Beerpay
-Hey dude! Help me out for a couple of :beers:!
+By buying me a coffee, not only you make my development more efficient, but also motivate me to further improve 
+my work. On the other hand, buying me a beer will certainly make me happier: **a toast to you, supporter**!
+
+[![Buy me a coffe!](https://www.buymeacoffee.com/assets/img/custom_images/black_img.png)](https://www.buymeacoffee.com/albertogeniola)
 
 [![Beerpay](https://beerpay.io/albertogeniola/meross-homeassistant/badge.svg?style=beer-square)](https://beerpay.io/albertogeniola/meross-homeassistant)  [![Beerpay](https://beerpay.io/albertogeniola/meross-homeassistant/make-wish.svg?style=flat-square)](https://beerpay.io/albertogeniola/meross-homeassistant?focus=wish)
diff --git a/build.sh b/build.sh
index beac7bf47f..7f7899541a 100644
--- a/build.sh
+++ b/build.sh
@@ -1,11 +1,11 @@
 # Run isort on the entire source
 pip install isort
-isort -rc meross_cloud
+isort -rc custom_components/meross_cloud
 
 # Clean the dist directory
 rm -vR dist
 mkdir dist
 
 # zip the meross_cloud sources
-zip -r dist/meross_cloud.zip meross_cloud
+zip -r dist/meross_cloud.zip custom_components/meross_cloud
 
diff --git a/meross_cloud/__init__.py b/custom_components/meross_cloud/__init__.py
similarity index 100%
rename from meross_cloud/__init__.py
rename to custom_components/meross_cloud/__init__.py
diff --git a/meross_cloud/common.py b/custom_components/meross_cloud/common.py
similarity index 100%
rename from meross_cloud/common.py
rename to custom_components/meross_cloud/common.py
diff --git a/meross_cloud/cover.py b/custom_components/meross_cloud/cover.py
similarity index 100%
rename from meross_cloud/cover.py
rename to custom_components/meross_cloud/cover.py
diff --git a/meross_cloud/light.py b/custom_components/meross_cloud/light.py
similarity index 100%
rename from meross_cloud/light.py
rename to custom_components/meross_cloud/light.py
diff --git a/meross_cloud/manifest.json b/custom_components/meross_cloud/manifest.json
similarity index 100%
rename from meross_cloud/manifest.json
rename to custom_components/meross_cloud/manifest.json
diff --git a/meross_cloud/sensor.py b/custom_components/meross_cloud/sensor.py
similarity index 100%
rename from meross_cloud/sensor.py
rename to custom_components/meross_cloud/sensor.py
diff --git a/meross_cloud/switch.py b/custom_components/meross_cloud/switch.py
similarity index 100%
rename from meross_cloud/switch.py
rename to custom_components/meross_cloud/switch.py