diff --git a/README.md b/README.md
index 4bc0bd1..477d50a 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,6 @@
 
 ## Available Components
 
-* [Maidsite Desk](components/maidsite_desk/)
+* [Maidesite Desk](components/maidesite_desk/)
 
 * [Panasonic Heatpump](components/panasonic_heatpump/)
diff --git a/components/maidsite_desk/README.md b/components/maidesite_desk/README.md
similarity index 95%
rename from components/maidsite_desk/README.md
rename to components/maidesite_desk/README.md
index 683f891..43dc69f 100644
--- a/components/maidsite_desk/README.md
+++ b/components/maidesite_desk/README.md
@@ -1,6 +1,6 @@
-# ESPHome Maidsite Desk Component
+# ESPHome Maidesite Desk Component
 
-[ESPHome](https://esphome.io/) component for controlling Maidsite desk controllers via their serial protocol.
+[ESPHome](https://esphome.io/) component for controlling Maidesite desk controllers via their serial protocol.
 
 ## Usage
 
@@ -44,7 +44,7 @@ external_components:
   - source:
       type: git
       url: https://github.com/ElVit/esphome_components/
-    components: [ maidsite_desk ]
+    components: [ maidesite_desk ]
 
 uart:
   - id: uart_bus
@@ -52,22 +52,22 @@ uart:
     rx_pin: GPIO4
     baud_rate: 9600
 
-maidsite_desk:
+maidesite_desk:
   id: my_desk
 
 sensor:
-  - platform: maidsite_desk
+  - platform: maidesite_desk
     height_abs:
       name: "Height"
 
 number:
-  - platform: maidsite_desk
+  - platform: maidesite_desk
     height_abs:
       name: "Height"
       mode: SLIDER
 
 button:
-  - platform: maidsite_desk
+  - platform: maidesite_desk
     stop:
       name: "Stop"
     step_up:
diff --git a/components/maidsite_desk/__init__.py b/components/maidesite_desk/__init__.py
similarity index 70%
rename from components/maidsite_desk/__init__.py
rename to components/maidesite_desk/__init__.py
index cee3701..b2aa354 100644
--- a/components/maidsite_desk/__init__.py
+++ b/components/maidesite_desk/__init__.py
@@ -8,16 +8,16 @@ CODEOWNERS = ['@elvit']
 MULTICONF = True
 DEPENDENCIES = ['uart']
 
-CONF_MAIDSITE_DESK_ID = "maidsite_desk"
+CONF_MAIDESITE_DESK_ID = "maidesite_desk"
 CONF_LOG_UART_MSG = "log_uart_msg"
 
-maidsite_desk_ns = cg.esphome_ns.namespace('maidsite_desk')
-MaidsiteDeskComponent = maidsite_desk_ns.class_('MaidsiteDeskComponent', cg.Component, uart.UARTDevice)
+maidesite_desk_ns = cg.esphome_ns.namespace('maidesite_desk')
+MaidesiteDeskComponent = maidesite_desk_ns.class_('MaidesiteDeskComponent', cg.Component, uart.UARTDevice)
 
 CONFIG_SCHEMA = (
   cv.Schema(
     {
-      cv.GenerateID(): cv.declare_id(MaidsiteDeskComponent),
+      cv.GenerateID(): cv.declare_id(MaidesiteDeskComponent),
 
       cv.Optional(CONF_LOG_UART_MSG, default=False): cv.boolean,
     }
diff --git a/components/maidsite_desk/button/__init__.py b/components/maidesite_desk/button/__init__.py
similarity index 73%
rename from components/maidsite_desk/button/__init__.py
rename to components/maidesite_desk/button/__init__.py
index 677707d..b4ee6fa 100644
--- a/components/maidsite_desk/button/__init__.py
+++ b/components/maidesite_desk/button/__init__.py
@@ -4,7 +4,7 @@ from esphome.components import button
 from esphome.const import (
   ENTITY_CATEGORY_CONFIG,
 )
-from .. import CONF_MAIDSITE_DESK_ID, MaidsiteDeskComponent, maidsite_desk_ns
+from .. import CONF_MAIDESITE_DESK_ID, MaidesiteDeskComponent, maidesite_desk_ns
 
 
 CONF_STEP_UP = "step_up"
@@ -37,64 +37,64 @@ TYPES = [
   CONF_SAVE_M4,
 ]
 
-MaidsiteDeskButton = maidsite_desk_ns.class_("MaidsiteDeskButton", button.Button, cg.Component)
+MaidesiteDeskButton = maidesite_desk_ns.class_("MaidesiteDeskButton", button.Button, cg.Component)
 
 CONFIG_SCHEMA = cv.Schema(
   {
-    cv.GenerateID(CONF_MAIDSITE_DESK_ID): cv.use_id(MaidsiteDeskComponent),
+    cv.GenerateID(CONF_MAIDESITE_DESK_ID): cv.use_id(MaidesiteDeskComponent),
 
     cv.Optional(CONF_STEP_UP): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
     ),
     cv.Optional(CONF_STEP_DOWN): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
     ),
     cv.Optional(CONF_STOP): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
     ),
     cv.Optional(CONF_GOTO_MAX): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
     ),
     cv.Optional(CONF_GOTO_MIN): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
     ),
     cv.Optional(CONF_GOTO_M1): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
     ),
     cv.Optional(CONF_GOTO_M2): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
     ),
     cv.Optional(CONF_GOTO_M3): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
     ),
     cv.Optional(CONF_GOTO_M4): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
     ),
     cv.Optional(CONF_SAVE_M1): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
       entity_category=ENTITY_CATEGORY_CONFIG,
     ),
     cv.Optional(CONF_SAVE_M2): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
       entity_category=ENTITY_CATEGORY_CONFIG,
     ),
     cv.Optional(CONF_SAVE_M3): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
       entity_category=ENTITY_CATEGORY_CONFIG,
     ),
     cv.Optional(CONF_SAVE_M4): button.button_schema(
-      MaidsiteDeskButton,
+      MaidesiteDeskButton,
       entity_category=ENTITY_CATEGORY_CONFIG,
     ),
   }
 ).extend(cv.COMPONENT_SCHEMA)
 
 async def to_code(config):
-  hub = await cg.get_variable(config[CONF_MAIDSITE_DESK_ID])
+  hub = await cg.get_variable(config[CONF_MAIDESITE_DESK_ID])
   for index, key in enumerate(TYPES):
     if child_config := config.get(key):
       var = await button.new_button(child_config)
       await cg.register_component(var, child_config)
-      await cg.register_parented(var, config[CONF_MAIDSITE_DESK_ID])
+      await cg.register_parented(var, config[CONF_MAIDESITE_DESK_ID])
       cg.add(getattr(hub, f"set_{key}_button")(var))
       cg.add(var.set_id(index))
diff --git a/components/maidesite_desk/button/maidesite_desk_button.cpp b/components/maidesite_desk/button/maidesite_desk_button.cpp
new file mode 100644
index 0000000..a8902f4
--- /dev/null
+++ b/components/maidesite_desk/button/maidesite_desk_button.cpp
@@ -0,0 +1,22 @@
+#include "maidesite_desk_button.h"
+#include "esphome/core/log.h"
+
+
+namespace esphome
+{
+  namespace maidesite_desk
+  {
+    static const char *const TAG = "maidesite_desk.button";
+
+    void MaidesiteDeskButton::dump_config()
+    {
+      LOG_BUTTON("", "Maidesite Desk Button", this);
+      delay(10);
+    }
+
+    void MaidesiteDeskButton::press_action()
+    {
+      this->parent_->button_press_action(this);
+    }
+  } // namespace maidesite_desk
+} // namespace esphome
diff --git a/components/maidsite_desk/button/maidsite_desk_button.h b/components/maidesite_desk/button/maidesite_desk_button.h
similarity index 56%
rename from components/maidsite_desk/button/maidsite_desk_button.h
rename to components/maidesite_desk/button/maidesite_desk_button.h
index 2c811be..75cfe12 100644
--- a/components/maidsite_desk/button/maidsite_desk_button.h
+++ b/components/maidesite_desk/button/maidesite_desk_button.h
@@ -1,17 +1,17 @@
 #pragma once
 #include "esphome/components/button/button.h"
 #include "esphome/core/component.h"
-#include "../maidsite_desk.h"
+#include "../maidesite_desk.h"
 
 
 namespace esphome
 {
-  namespace maidsite_desk
+  namespace maidesite_desk
   {
-    class MaidsiteDeskButton : public button::Button, public Component, public Parented<MaidsiteDeskComponent>
+    class MaidesiteDeskButton : public button::Button, public Component, public Parented<MaidesiteDeskComponent>
     {
     public:
-      MaidsiteDeskButton() = default;
+      MaidesiteDeskButton() = default;
       void dump_config() override;
       void set_id(int id) { this->id_ = id; }
 
@@ -19,5 +19,5 @@ namespace esphome
       void press_action() override;
       int id_;
     };
-  } // namespace maidsite_desk
+  } // namespace maidesite_desk
 } // namespace esphome
diff --git a/components/maidsite_desk/maidsite_desk.cpp b/components/maidesite_desk/maidesite_desk.cpp
similarity index 87%
rename from components/maidsite_desk/maidsite_desk.cpp
rename to components/maidesite_desk/maidesite_desk.cpp
index 275f840..d73e562 100644
--- a/components/maidsite_desk/maidsite_desk.cpp
+++ b/components/maidesite_desk/maidesite_desk.cpp
@@ -1,21 +1,21 @@
-#include "maidsite_desk.h"
+#include "maidesite_desk.h"
 
 
 namespace esphome
 {
-  namespace maidsite_desk
+  namespace maidesite_desk
   {
-    static const char *const TAG = "maidsite_desk";
+    static const char *const TAG = "maidesite_desk";
 
-    void MaidsiteDeskComponent::dump_config()
+    void MaidesiteDeskComponent::dump_config()
     {
-      ESP_LOGCONFIG(TAG, "Maidsite Desk");
+      ESP_LOGCONFIG(TAG, "Maidesite Desk");
       delay(10);
     }
 
-    void MaidsiteDeskComponent::setup()
+    void MaidesiteDeskComponent::setup()
     {
-      ESP_LOGCONFIG(TAG, "Setting up Maidsite Desk ...");
+      ESP_LOGCONFIG(TAG, "Setting up Maidesite Desk ...");
       delay(10);
       this->check_uart_settings(9600);
       this->request_physical_limits();
@@ -23,7 +23,7 @@ namespace esphome
       this->request_settings();
     }
 
-    void MaidsiteDeskComponent::loop()
+    void MaidesiteDeskComponent::loop()
     {
       // This is a very simple method of receiving messages from the desk.
       // It will fail on messages that contain the value 0x7E in their payload.
@@ -77,7 +77,7 @@ namespace esphome
       }
     }
 
-    void MaidsiteDeskComponent::log_uart_hex(std::string prefix, std::vector<uint8_t> bytes, uint8_t separator)
+    void MaidesiteDeskComponent::log_uart_hex(std::string prefix, std::vector<uint8_t> bytes, uint8_t separator)
     {
       if (this->log_uart_msg_ == false) return;
 
@@ -97,7 +97,7 @@ namespace esphome
       }
     }
 
-    void MaidsiteDeskComponent::decode_response(std::vector<uint8_t> message)
+    void MaidesiteDeskComponent::decode_response(std::vector<uint8_t> message)
     {
       // ToDo: Add checksum check
 
@@ -219,7 +219,7 @@ namespace esphome
       }
     }
 
-    float MaidsiteDeskComponent::byte2float(int high, int low)
+    float MaidesiteDeskComponent::byte2float(int high, int low)
     {
       return static_cast<float>((high << 8) + low) / 10;
     }
@@ -227,7 +227,7 @@ namespace esphome
     // Write message:
     // format: 0xF1 0xF1 [command] [param_count] [[param] ...] [checksum] 0x7E
     // checksum: sum of [command], [param_count] and all [param]s
-    void MaidsiteDeskComponent::send_simple_command(unsigned char cmd)
+    void MaidesiteDeskComponent::send_simple_command(unsigned char cmd)
     {
       this->request_message_.clear();
       this->request_message_.insert(this->request_message_.end(), { 0xF1, 0xF1, cmd, 0x00, cmd, 0x7E });
@@ -236,7 +236,7 @@ namespace esphome
       delay(100);  // NOLINT
     }
 
-    void MaidsiteDeskComponent::send_2byte_command(unsigned char cmd, unsigned char high_byte, unsigned char low_byte)
+    void MaidesiteDeskComponent::send_2byte_command(unsigned char cmd, unsigned char high_byte, unsigned char low_byte)
     {
       // ToDo: make one function of send_simple_command and send_2byte_command
 
@@ -248,22 +248,22 @@ namespace esphome
       delay(100);  // NOLINT
     }
 
-    void MaidsiteDeskComponent::step_up()
+    void MaidesiteDeskComponent::step_up()
     {
       this->send_simple_command(0x01);
     }
 
-    void MaidsiteDeskComponent::step_down()
+    void MaidesiteDeskComponent::step_down()
     {
       this->send_simple_command(0x02);
     }
 
-    void MaidsiteDeskComponent::stop()
+    void MaidesiteDeskComponent::stop()
     {
       this->send_simple_command(0x2B);
     }
 
-    void MaidsiteDeskComponent::goto_mem_position(int pos)
+    void MaidesiteDeskComponent::goto_mem_position(int pos)
     {
       switch (pos)
       {
@@ -282,7 +282,7 @@ namespace esphome
       }
     }
 
-    void MaidsiteDeskComponent::save_mem_position(int pos)
+    void MaidesiteDeskComponent::save_mem_position(int pos)
     {
       switch (pos)
       {
@@ -301,37 +301,37 @@ namespace esphome
       }
     }
 
-    void MaidsiteDeskComponent::request_physical_limits()
+    void MaidesiteDeskComponent::request_physical_limits()
     {
       this->send_simple_command(0x0C);
     }
 
-    void MaidsiteDeskComponent::request_limits()
+    void MaidesiteDeskComponent::request_limits()
     {
       this->send_simple_command(0x20);
     }
 
-    void MaidsiteDeskComponent::request_settings()
+    void MaidesiteDeskComponent::request_settings()
     {
       this->send_simple_command(0x07);
     }
 
-    void MaidsiteDeskComponent::request_move_to()
+    void MaidesiteDeskComponent::request_move_to()
     {
       this->send_simple_command(0x1B);
     }
 
-    void MaidsiteDeskComponent::goto_max_position()
+    void MaidesiteDeskComponent::goto_max_position()
     {
       this->goto_height(limit_max_);
     }
 
-    void MaidsiteDeskComponent::goto_min_position()
+    void MaidesiteDeskComponent::goto_min_position()
     {
       this->goto_height(limit_min_);
     }
 
-    void MaidsiteDeskComponent::goto_height(float height)
+    void MaidesiteDeskComponent::goto_height(float height)
     {
       unsigned char high_byte = ((int)height * 10) >> 8;
       unsigned char low_byte = ((int)height * 10) & 0xFF;
@@ -341,7 +341,7 @@ namespace esphome
     }
 
 #ifdef USE_BUTTON
-    void MaidsiteDeskComponent::button_press_action(button::Button* object)
+    void MaidesiteDeskComponent::button_press_action(button::Button* object)
     {
       if (object == step_up_button_)
         this->step_up();
@@ -384,7 +384,7 @@ namespace esphome
     }
 #endif
 #ifdef USE_NUMBER
-    void MaidsiteDeskComponent::number_control(number::Number* object, float value)
+    void MaidesiteDeskComponent::number_control(number::Number* object, float value)
     {
       if (object == height_abs_number_)
         this->goto_height(value);
@@ -393,5 +393,5 @@ namespace esphome
           this->goto_height((limit_max_ - limit_min_) * value / 100 + limit_min_);
     }
 #endif
-  } // namespace maidsite_desk
+  } // namespace maidesite_desk
 } // namespace esphome
diff --git a/components/maidsite_desk/maidsite_desk.h b/components/maidesite_desk/maidesite_desk.h
similarity index 94%
rename from components/maidsite_desk/maidsite_desk.h
rename to components/maidesite_desk/maidesite_desk.h
index d3647ce..f1ca6fd 100644
--- a/components/maidsite_desk/maidsite_desk.h
+++ b/components/maidesite_desk/maidesite_desk.h
@@ -20,10 +20,10 @@
 
 namespace esphome
 {
-  namespace maidsite_desk
+  namespace maidesite_desk
   {
 
-    class MaidsiteDeskComponent : public Component, public uart::UARTDevice
+    class MaidesiteDeskComponent : public Component, public uart::UARTDevice
     {
     public:
 #ifdef USE_SENSOR
@@ -62,7 +62,7 @@ namespace esphome
       void number_control(number::Number* object, float value);
 #endif
 
-      MaidsiteDeskComponent() = default;
+      MaidesiteDeskComponent() = default;
       // base class functions
       float get_setup_priority() const override { return setup_priority::LATE; }
       void dump_config() override;
@@ -110,5 +110,5 @@ namespace esphome
       float physical_min_ = 0;
       float physical_max_ = 0;
     };
-  } // namespace maidsite_desk
+  } // namespace maidesite_desk
 } // namespace esphome
diff --git a/components/maidsite_desk/number/__init__.py b/components/maidesite_desk/number/__init__.py
similarity index 70%
rename from components/maidsite_desk/number/__init__.py
rename to components/maidesite_desk/number/__init__.py
index 1cde91b..496cdaa 100644
--- a/components/maidsite_desk/number/__init__.py
+++ b/components/maidesite_desk/number/__init__.py
@@ -5,7 +5,7 @@ from esphome.const import (
   UNIT_CENTIMETER,
   UNIT_PERCENT,
 )
-from .. import CONF_MAIDSITE_DESK_ID, MaidsiteDeskComponent, maidsite_desk_ns
+from .. import CONF_MAIDESITE_DESK_ID, MaidesiteDeskComponent, maidesite_desk_ns
 
 
 CONF_HEIGHT_ABS = "height_abs"
@@ -21,25 +21,25 @@ CONF_NUMBERS = [
   [ 0, 100, .1, ],
 ]
 
-MaidsiteDeskNumber = maidsite_desk_ns.class_("MaidsiteDeskNumber", number.Number, cg.Component)
+MaidesiteDeskNumber = maidesite_desk_ns.class_("MaidesiteDeskNumber", number.Number, cg.Component)
 
 CONFIG_SCHEMA = cv.Schema(
   {
-    cv.GenerateID(CONF_MAIDSITE_DESK_ID): cv.use_id(MaidsiteDeskComponent),
+    cv.GenerateID(CONF_MAIDESITE_DESK_ID): cv.use_id(MaidesiteDeskComponent),
 
     cv.Optional(CONF_HEIGHT_ABS): number.number_schema(
-      MaidsiteDeskNumber,
+      MaidesiteDeskNumber,
       unit_of_measurement=UNIT_CENTIMETER,
     ),
     cv.Optional(CONF_HEIGHT_PCT): number.number_schema(
-      MaidsiteDeskNumber,
+      MaidesiteDeskNumber,
       unit_of_measurement=UNIT_PERCENT,
     ),
   }
 ).extend(cv.COMPONENT_SCHEMA)
 
 async def to_code(config):
-  hub = await cg.get_variable(config[CONF_MAIDSITE_DESK_ID])
+  hub = await cg.get_variable(config[CONF_MAIDESITE_DESK_ID])
   for index, key in enumerate(TYPES):
     if child_config := config.get(key):
       var = await number.new_number(
@@ -49,6 +49,6 @@ async def to_code(config):
         step=CONF_NUMBERS[index][2]
       )
       await cg.register_component(var, child_config)
-      await cg.register_parented(var, config[CONF_MAIDSITE_DESK_ID])
+      await cg.register_parented(var, config[CONF_MAIDESITE_DESK_ID])
       cg.add(getattr(hub, f"set_{key}_number")(var))
       cg.add(var.set_id(index))
diff --git a/components/maidesite_desk/number/maidesite_desk_number.cpp b/components/maidesite_desk/number/maidesite_desk_number.cpp
new file mode 100644
index 0000000..82335aa
--- /dev/null
+++ b/components/maidesite_desk/number/maidesite_desk_number.cpp
@@ -0,0 +1,23 @@
+#include "maidesite_desk_number.h"
+#include "esphome/core/log.h"
+
+
+namespace esphome
+{
+  namespace maidesite_desk
+  {
+    static const char *const TAG = "maidesite_desk.number";
+
+    void MaidesiteDeskNumber::dump_config()
+    {
+      LOG_NUMBER("", "Maidesite Desk Number", this);
+      delay(10);
+    }
+
+    void MaidesiteDeskNumber::control(float value)
+    {
+      this->publish_state(value);
+      this->parent_->number_control(this, value);
+    }
+  } // namespace maidesite_desk
+} // namespace esphome
diff --git a/components/maidsite_desk/number/maidsite_desk_number.h b/components/maidesite_desk/number/maidesite_desk_number.h
similarity index 57%
rename from components/maidsite_desk/number/maidsite_desk_number.h
rename to components/maidesite_desk/number/maidesite_desk_number.h
index 76aca70..53bd72a 100644
--- a/components/maidsite_desk/number/maidsite_desk_number.h
+++ b/components/maidesite_desk/number/maidesite_desk_number.h
@@ -1,17 +1,17 @@
 #pragma once
 #include "esphome/components/number/number.h"
 #include "esphome/core/component.h"
-#include "../maidsite_desk.h"
+#include "../maidesite_desk.h"
 
 
 namespace esphome
 {
-  namespace maidsite_desk
+  namespace maidesite_desk
   {
-    class MaidsiteDeskNumber : public number::Number, public Component, public Parented<MaidsiteDeskComponent>
+    class MaidesiteDeskNumber : public number::Number, public Component, public Parented<MaidesiteDeskComponent>
     {
     public:
-      MaidsiteDeskNumber() = default;
+      MaidesiteDeskNumber() = default;
       void dump_config() override;
       void set_id(int id) { this->id_ = id; }
 
@@ -19,5 +19,5 @@ namespace esphome
       void control(float value) override;
       int id_;
     };
-  } // namespace maidsite_desk
+  } // namespace maidesite_desk
 } // namespace esphome
diff --git a/components/maidsite_desk/sensor/__init__.py b/components/maidesite_desk/sensor/__init__.py
similarity index 77%
rename from components/maidsite_desk/sensor/__init__.py
rename to components/maidesite_desk/sensor/__init__.py
index b4c4adc..dd43a40 100644
--- a/components/maidsite_desk/sensor/__init__.py
+++ b/components/maidesite_desk/sensor/__init__.py
@@ -5,7 +5,7 @@ from esphome.const import (
   UNIT_CENTIMETER,
   UNIT_PERCENT,
 )
-from .. import CONF_MAIDSITE_DESK_ID, MaidsiteDeskComponent, maidsite_desk_ns
+from .. import CONF_MAIDESITE_DESK_ID, MaidesiteDeskComponent, maidesite_desk_ns
 
 CONF_UNIT = "unit"
 CONF_HEIGHT_ABS = "height_abs"
@@ -29,51 +29,51 @@ TYPES = [
   CONF_POSITION_M4,
 ]
 
-MaidsiteDeskSensor = maidsite_desk_ns.class_("MaidsiteDeskSensor", sensor.Sensor, cg.Component)
+MaidesiteDeskSensor = maidesite_desk_ns.class_("MaidesiteDeskSensor", sensor.Sensor, cg.Component)
 
 CONFIG_SCHEMA = cv.Schema(
   {
-    cv.GenerateID(CONF_MAIDSITE_DESK_ID): cv.use_id(MaidsiteDeskComponent),
+    cv.GenerateID(CONF_MAIDESITE_DESK_ID): cv.use_id(MaidesiteDeskComponent),
 
     cv.Optional(CONF_UNIT): sensor.sensor_schema(),
 
     cv.Optional(CONF_HEIGHT_ABS): sensor.sensor_schema(
-      MaidsiteDeskSensor,
+      MaidesiteDeskSensor,
       accuracy_decimals=2,
       unit_of_measurement=UNIT_CENTIMETER,
     ),
     cv.Optional(CONF_HEIGHT_PCT): sensor.sensor_schema(
-      MaidsiteDeskSensor,
+      MaidesiteDeskSensor,
       accuracy_decimals=2,
       unit_of_measurement=UNIT_PERCENT,
     ),
     cv.Optional(CONF_HEIGHT_MIN): sensor.sensor_schema(
-      MaidsiteDeskSensor,
+      MaidesiteDeskSensor,
       accuracy_decimals=2,
       unit_of_measurement=UNIT_CENTIMETER,
     ),
     cv.Optional(CONF_HEIGHT_MAX): sensor.sensor_schema(
-      MaidsiteDeskSensor,
+      MaidesiteDeskSensor,
       accuracy_decimals=2,
       unit_of_measurement=UNIT_CENTIMETER,
     ),
     cv.Optional(CONF_POSITION_M1): sensor.sensor_schema(
-      MaidsiteDeskSensor,
+      MaidesiteDeskSensor,
       accuracy_decimals=2,
       unit_of_measurement=UNIT_CENTIMETER,
     ),
     cv.Optional(CONF_POSITION_M2): sensor.sensor_schema(
-      MaidsiteDeskSensor,
+      MaidesiteDeskSensor,
       accuracy_decimals=2,
       unit_of_measurement=UNIT_CENTIMETER,
     ),
     cv.Optional(CONF_POSITION_M3): sensor.sensor_schema(
-      MaidsiteDeskSensor,
+      MaidesiteDeskSensor,
       accuracy_decimals=2,
       unit_of_measurement=UNIT_CENTIMETER,
     ),
     cv.Optional(CONF_POSITION_M4): sensor.sensor_schema(
-      MaidsiteDeskSensor,
+      MaidesiteDeskSensor,
       accuracy_decimals=2,
       unit_of_measurement=UNIT_CENTIMETER,
     ),
@@ -81,10 +81,10 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 async def to_code(config):
-  hub = await cg.get_variable(config[CONF_MAIDSITE_DESK_ID])
+  hub = await cg.get_variable(config[CONF_MAIDESITE_DESK_ID])
   for key in TYPES:
     if child_config := config.get(key):
       var = await sensor.new_sensor(child_config)
       await cg.register_component(var, child_config)
-      await cg.register_parented(var, config[CONF_MAIDSITE_DESK_ID])
+      await cg.register_parented(var, config[CONF_MAIDESITE_DESK_ID])
       cg.add(getattr(hub, f"set_{key}_sensor")(var))
diff --git a/components/maidesite_desk/sensor/maidesite_desk_sensor.cpp b/components/maidesite_desk/sensor/maidesite_desk_sensor.cpp
new file mode 100644
index 0000000..275a9da
--- /dev/null
+++ b/components/maidesite_desk/sensor/maidesite_desk_sensor.cpp
@@ -0,0 +1,17 @@
+#include "maidesite_desk_sensor.h"
+#include "esphome/core/log.h"
+
+
+namespace esphome
+{
+  namespace maidesite_desk
+  {
+    static const char *const TAG = "maidesite_desk.sensor";
+
+    void MaidesiteDeskSensor::dump_config()
+    {
+      LOG_SENSOR("", "Maidesite Desk Sensor", this);
+      delay(10);
+    }
+  } // namespace maidesite_desk
+} // namespace esphome
diff --git a/components/maidesite_desk/sensor/maidesite_desk_sensor.h b/components/maidesite_desk/sensor/maidesite_desk_sensor.h
new file mode 100644
index 0000000..1800ada
--- /dev/null
+++ b/components/maidesite_desk/sensor/maidesite_desk_sensor.h
@@ -0,0 +1,18 @@
+#pragma once
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/core/component.h"
+#include "../maidesite_desk.h"
+
+
+namespace esphome
+{
+  namespace maidesite_desk
+  {
+    class MaidesiteDeskSensor : public sensor::Sensor, public Component, public Parented<MaidesiteDeskComponent>
+    {
+    public:
+      MaidesiteDeskSensor() = default;
+      void dump_config() override;
+    };
+  } // namespace maidesite_desk
+} // namespace esphome
diff --git a/components/maidsite_desk/button/maidsite_desk_button.cpp b/components/maidsite_desk/button/maidsite_desk_button.cpp
deleted file mode 100644
index 869ff62..0000000
--- a/components/maidsite_desk/button/maidsite_desk_button.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "maidsite_desk_button.h"
-#include "esphome/core/log.h"
-
-
-namespace esphome
-{
-  namespace maidsite_desk
-  {
-    static const char *const TAG = "maidsite_desk.button";
-
-    void MaidsiteDeskButton::dump_config()
-    {
-      LOG_BUTTON("", "Maidsite Desk Button", this);
-      delay(10);
-    }
-
-    void MaidsiteDeskButton::press_action()
-    {
-      this->parent_->button_press_action(this);
-    }
-  } // namespace maidsite_desk
-} // namespace esphome
diff --git a/components/maidsite_desk/number/maidsite_desk_number.cpp b/components/maidsite_desk/number/maidsite_desk_number.cpp
deleted file mode 100644
index 31c0edd..0000000
--- a/components/maidsite_desk/number/maidsite_desk_number.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "maidsite_desk_number.h"
-#include "esphome/core/log.h"
-
-
-namespace esphome
-{
-  namespace maidsite_desk
-  {
-    static const char *const TAG = "maidsite_desk.number";
-
-    void MaidsiteDeskNumber::dump_config()
-    {
-      LOG_NUMBER("", "Maidsite Desk Number", this);
-      delay(10);
-    }
-
-    void MaidsiteDeskNumber::control(float value)
-    {
-      this->publish_state(value);
-      this->parent_->number_control(this, value);
-    }
-  } // namespace maidsite_desk
-} // namespace esphome
diff --git a/components/maidsite_desk/sensor/maidsite_desk_sensor.cpp b/components/maidsite_desk/sensor/maidsite_desk_sensor.cpp
deleted file mode 100644
index 87853a0..0000000
--- a/components/maidsite_desk/sensor/maidsite_desk_sensor.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "maidsite_desk_sensor.h"
-#include "esphome/core/log.h"
-
-
-namespace esphome
-{
-  namespace maidsite_desk
-  {
-    static const char *const TAG = "maidsite_desk.sensor";
-
-    void MaidsiteDeskSensor::dump_config()
-    {
-      LOG_SENSOR("", "Maidsite Desk Sensor", this);
-      delay(10);
-    }
-  } // namespace maidsite_desk
-} // namespace esphome
diff --git a/components/maidsite_desk/sensor/maidsite_desk_sensor.h b/components/maidsite_desk/sensor/maidsite_desk_sensor.h
deleted file mode 100644
index fc63ff1..0000000
--- a/components/maidsite_desk/sensor/maidsite_desk_sensor.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/core/component.h"
-#include "../maidsite_desk.h"
-
-
-namespace esphome
-{
-  namespace maidsite_desk
-  {
-    class MaidsiteDeskSensor : public sensor::Sensor, public Component, public Parented<MaidsiteDeskComponent>
-    {
-    public:
-      MaidsiteDeskSensor() = default;
-      void dump_config() override;
-    };
-  } // namespace maidsite_desk
-} // namespace esphome
diff --git a/example_maidsite_desk.yaml b/example_maidsite_desk.yaml
new file mode 100644
index 0000000..06d395c
--- /dev/null
+++ b/example_maidsite_desk.yaml
@@ -0,0 +1 @@
+prototypes/maidesite_desk/example_basic.yaml
\ No newline at end of file
diff --git a/example_maidsite_desk_controller.yaml b/example_maidsite_desk_controller.yaml
deleted file mode 100644
index ee82bf4..0000000
--- a/example_maidsite_desk_controller.yaml
+++ /dev/null
@@ -1 +0,0 @@
-components/maidsite_desk_controller/example_basic.yaml
\ No newline at end of file
diff --git a/components/maidsite_desk/example_basic.yaml b/prototypes/maidesite_desk/example_basic.yaml
similarity index 82%
rename from components/maidsite_desk/example_basic.yaml
rename to prototypes/maidesite_desk/example_basic.yaml
index 336b6d2..b30cbb3 100644
--- a/components/maidsite_desk/example_basic.yaml
+++ b/prototypes/maidesite_desk/example_basic.yaml
@@ -1,12 +1,12 @@
 esphome:
-  name: maidsite-desk
-  friendly_name: Maidsite Desk
+  name: maidesite-desk
+  friendly_name: Maidesite Desk
 
 external_components:
   - source:
       type: git
       url: https://github.com/ElVit/esphome_components/
-    components: [ maidsite_desk ]
+    components: [ maidesite_desk ]
 
 uart:
   - id: uart_bus
@@ -14,16 +14,16 @@ uart:
     rx_pin: $pin_rx
     baud_rate: 9600
 
-maidsite_desk_controller:
+maidesite_desk_controller:
   id: my_desk
 
 sensor:
-  - platform: maidsite_desk
+  - platform: maidesite_desk
     height_abs:
       name: "Height"
 
 button:
-  - platform: maidsite_desk
+  - platform: maidesite_desk
     stop:
       name: "Stop"
     step_up:
@@ -44,7 +44,7 @@ button:
       name: "Move to M4"
 
 number:
-  - platform: maidsite_desk
+  - platform: maidesite_desk
     height_abs:
       name: "Height"
       mode: SLIDER
diff --git a/components/maidsite_desk/example_full.yaml b/prototypes/maidesite_desk/example_full.yaml
similarity index 91%
rename from components/maidsite_desk/example_full.yaml
rename to prototypes/maidesite_desk/example_full.yaml
index 52d9a01..0fef52d 100644
--- a/components/maidsite_desk/example_full.yaml
+++ b/prototypes/maidesite_desk/example_full.yaml
@@ -1,6 +1,6 @@
 esphome:
-  name: maidsite-desk-controller
-  friendly_name: Maidsite Desk Controller
+  name: maidesite-desk-controller
+  friendly_name: Maidesite Desk Controller
 
 external_components:
   - source:
@@ -8,7 +8,7 @@ external_components:
       path: esphome_components/components/
       # type: git
       # url: https://github.com/ElVit/esphome_components/
-    components: [ maidsite_desk ]
+    components: [ maidesite_desk ]
 
 uart:
   - id: uart_bus
@@ -16,12 +16,12 @@ uart:
     rx_pin: $pin_rx
     baud_rate: 9600
 
-maidsite_desk_controller:
+maidesite_desk_controller:
   id: my_desk
   uart_id: uart_bus
 
 sensor:
-  - platform: maidsite_desk
+  - platform: maidesite_desk
     height_abs:
       name: "Height absolut"
     height_pct:
@@ -40,7 +40,7 @@ sensor:
       name: "Position M4"
 
 button:
-  - platform: maidsite_desk
+  - platform: maidesite_desk
     stop:
       name: "Stop"
     step_up:
@@ -69,7 +69,7 @@ button:
       name: "Save M4"
 
 number:
-  - platform: maidsite_desk
+  - platform: maidesite_desk
     height_abs:
       name: "Height absolut"
       mode: SLIDER
diff --git a/components/maidsite_desk/stl/D1mini Case Bottom.stl b/prototypes/maidesite_desk/stl/D1mini Case Bottom.stl
similarity index 100%
rename from components/maidsite_desk/stl/D1mini Case Bottom.stl
rename to prototypes/maidesite_desk/stl/D1mini Case Bottom.stl
diff --git a/components/maidsite_desk/stl/D1mini Case Clamp.stl b/prototypes/maidesite_desk/stl/D1mini Case Clamp.stl
similarity index 100%
rename from components/maidsite_desk/stl/D1mini Case Clamp.stl
rename to prototypes/maidesite_desk/stl/D1mini Case Clamp.stl
diff --git a/components/maidsite_desk/stl/D1mini Case Table Clamp A.stl b/prototypes/maidesite_desk/stl/D1mini Case Table Clamp A.stl
similarity index 100%
rename from components/maidsite_desk/stl/D1mini Case Table Clamp A.stl
rename to prototypes/maidesite_desk/stl/D1mini Case Table Clamp A.stl
diff --git a/components/maidsite_desk/stl/D1mini Case Table Clamp B.stl b/prototypes/maidesite_desk/stl/D1mini Case Table Clamp B.stl
similarity index 100%
rename from components/maidsite_desk/stl/D1mini Case Table Clamp B.stl
rename to prototypes/maidesite_desk/stl/D1mini Case Table Clamp B.stl
diff --git a/components/maidsite_desk/stl/D1mini Case Top.stl b/prototypes/maidesite_desk/stl/D1mini Case Top.stl
similarity index 100%
rename from components/maidsite_desk/stl/D1mini Case Top.stl
rename to prototypes/maidesite_desk/stl/D1mini Case Top.stl