diff --git a/ge1mer/domofon.yaml b/ge1mer/domofon.yaml
index 8e2f63e..b4732cb 100644
--- a/ge1mer/domofon.yaml
+++ b/ge1mer/domofon.yaml
@@ -4,17 +4,6 @@
 ############# User configuration #############
 
 substitutions:
-  # Ge1mer board
-  board: esp12e
-  pin_relay_answer: GPIO14    # 330 Ohm, NO relay
-  pin_relay_phone: GPIO16     # Intercom, NC relay
-  pin_relay_mute: GPIO12      # 50 Ohm, NO relay
-  pin_led_red: GPIO5
-  pin_led_green: GPIO4
-  pin_led_blue: GPIO15
-  pin_call_detect: GPIO13
-  pin_btn_accept: GPIO0
-
   # Build configuration
   board_name: "Domofon"
   mdns_name: "domofon"
@@ -24,9 +13,9 @@ substitutions:
   phone_relay_inverted: 'true'  # Set to 'false' if you have NO phone relay
 
   # Wifi credentials
-  wifi_ssid: "-----"
-  wifi_password: ""
-  ap_ssid: "Domofon"
+  wifi_ssid: !secret wifi_ssid
+  wifi_password: !secret wifi_password
+  ap_ssid: "domofon"
   ap_password: "1234567890"
 
   # MQTT credentials
@@ -47,15 +36,8 @@ substitutions:
 ########### End user configuration ###########
 
 packages:
-  base: !include domofon_packages/base.yaml
-  api: !include domofon_packages/api.yaml
-  #mqtt: !include domofon_packages/mqtt.yaml
-  #web_server: !include domofon_packages/web_server.yaml
-  #captive_portal: !include domofon_packages/captive_portal.yaml
-  number: !include domofon_packages/number.yaml
-  script: !include domofon_packages/script.yaml
-  output: !include domofon_packages/output.yaml
-  switch: !include domofon_packages/switch.yaml
-  button: !include domofon_packages/button.yaml
-  light: !include domofon_packages/light.yaml
-  binary_sensor: !include domofon_packages/binary_sensor.yaml
+  base: github://Anonym-tsk/smart-domofon/ge1mer/esphome/packages/base.yaml@master
+  api: github://Anonym-tsk/smart-domofon/ge1mer/esphome/packages/api.yaml@master
+  #mqtt: github://Anonym-tsk/smart-domofon/ge1mer/esphome/packages/mqtt.yaml@master
+  #web_server: github://Anonym-tsk/smart-domofon/ge1mer/esphome/packages/web_server.yaml@master
+  #captive_portal: github://Anonym-tsk/smart-domofon/ge1mer/esphome/packages/captive_portal.yaml@master
diff --git a/ge1mer/domofon_packages/includes/binary_sensor.captive.yaml b/ge1mer/domofon_packages/includes/binary_sensor.captive.yaml
deleted file mode 100644
index 8247797..0000000
--- a/ge1mer/domofon_packages/includes/binary_sensor.captive.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# 8 times click - run captive portal
-timing:
-  - ON for 5ms to 1s
-  - OFF for 5ms to 1s
-  - ON for 5ms to 1s
-  - OFF for 5ms to 1s
-  - ON for 5ms to 1s
-  - OFF for 5ms to 1s
-  - ON for 5ms to 1s
-  - OFF for 5ms to 1s
-  - ON for 5ms to 1s
-  - OFF for 5ms to 1s
-  - ON for 5ms to 1s
-  - OFF for 5ms to 1s
-  - ON for 5ms to 1s
-  - OFF for 5ms to 1s
-  - ON for 5ms to 1s
-then:
-  lambda: |-
-    ESP_LOGW("DMF", "Erase settings and restart...");
-    captive_portal::global_captive_portal->override_sta_mqtt("-----", "", "10.0.0.1", "1883", "", "");
-    delay(500);
-    ESP.restart();
\ No newline at end of file
diff --git a/ge1mer/domofon_packages/api.yaml b/ge1mer/esphome/packages/api.yaml
similarity index 100%
rename from ge1mer/domofon_packages/api.yaml
rename to ge1mer/esphome/packages/api.yaml
diff --git a/ge1mer/domofon_packages/base.yaml b/ge1mer/esphome/packages/base.yaml
similarity index 80%
rename from ge1mer/domofon_packages/base.yaml
rename to ge1mer/esphome/packages/base.yaml
index f137bfc..bf58e40 100644
--- a/ge1mer/domofon_packages/base.yaml
+++ b/ge1mer/esphome/packages/base.yaml
@@ -3,7 +3,7 @@ esphome:
   build_path: $build_path
   platform: ESP8266
   board: $board
-  comment: "https://github.com/Anonym-tsk/smart-domofon/tree/master/ge1mer"
+  comment: "espdomofon.ru"
   esp8266_restore_from_flash: true
   project:
     name: "espdomofon.ru"
@@ -97,3 +97,24 @@ text_sensor:
     name: "${board_name} Uptime"
     icon: mdi:clock-start
     entity_category: "diagnostic"
+
+substitutions:
+  # Ge1mer board
+  board: esp12e
+  pin_relay_answer: GPIO14    # 330 Ohm, NO relay
+  pin_relay_phone: GPIO16     # Intercom, NC relay
+  pin_relay_mute: GPIO12      # 50 Ohm, NO relay
+  pin_led_red: GPIO5
+  pin_led_green: GPIO4
+  pin_led_blue: GPIO15
+  pin_call_detect: GPIO13
+  pin_btn_accept: GPIO0
+
+packages:
+  number: !include number.yaml
+  script: !include script.yaml
+  output: !include output.yaml
+  switch: !include switch.yaml
+  button: !include button.yaml
+  light: !include light.yaml
+  binary_sensor: !include binary_sensor.yaml
diff --git a/ge1mer/domofon_packages/binary_sensor.yaml b/ge1mer/esphome/packages/binary_sensor.yaml
similarity index 74%
rename from ge1mer/domofon_packages/binary_sensor.yaml
rename to ge1mer/esphome/packages/binary_sensor.yaml
index edeaed3..b79f09c 100644
--- a/ge1mer/domofon_packages/binary_sensor.yaml
+++ b/ge1mer/esphome/packages/binary_sensor.yaml
@@ -84,4 +84,32 @@ binary_sensor:
                 id(mode_auto_reject) = false;
               }
             }
-#      - <<: !include includes/binary_sensor.captive.yaml
+
+#      # 8 clicks - forget wifi settings
+#      - timing:
+#        - ON for 5ms to 1s
+#        - OFF for 5ms to 1s
+#        - ON for 5ms to 1s
+#        - OFF for 5ms to 1s
+#        - ON for 5ms to 1s
+#        - OFF for 5ms to 1s
+#        - ON for 5ms to 1s
+#        - OFF for 5ms to 1s
+#        - ON for 5ms to 1s
+#        - OFF for 5ms to 1s
+#        - ON for 5ms to 1s
+#        - OFF for 5ms to 1s
+#        - ON for 5ms to 1s
+#        - OFF for 5ms to 1s
+#        - ON for 5ms to 1s
+#        then:
+#          lambda: |-
+#            ESP_LOGW("DMF", "Erase settings and restart...");
+#            id(mode_auto_open) = false;
+#            id(mode_auto_open_once) = false;
+#            id(mode_auto_reject) = false;
+#            id(mode_mute) = false;
+#            id(mode_mute_once) = false;
+#            wifi::global_wifi_component->save_wifi_sta("-----", "");
+#            delay(500);
+#            ESP.restart();
diff --git a/ge1mer/domofon_packages/button.yaml b/ge1mer/esphome/packages/button.yaml
similarity index 100%
rename from ge1mer/domofon_packages/button.yaml
rename to ge1mer/esphome/packages/button.yaml
diff --git a/ge1mer/domofon_packages/captive_portal.yaml b/ge1mer/esphome/packages/captive_portal.yaml
similarity index 100%
rename from ge1mer/domofon_packages/captive_portal.yaml
rename to ge1mer/esphome/packages/captive_portal.yaml
diff --git a/ge1mer/domofon_packages/light.yaml b/ge1mer/esphome/packages/light.yaml
similarity index 100%
rename from ge1mer/domofon_packages/light.yaml
rename to ge1mer/esphome/packages/light.yaml
diff --git a/ge1mer/domofon_packages/mqtt.yaml b/ge1mer/esphome/packages/mqtt.yaml
similarity index 100%
rename from ge1mer/domofon_packages/mqtt.yaml
rename to ge1mer/esphome/packages/mqtt.yaml
diff --git a/ge1mer/domofon_packages/number.yaml b/ge1mer/esphome/packages/number.yaml
similarity index 100%
rename from ge1mer/domofon_packages/number.yaml
rename to ge1mer/esphome/packages/number.yaml
diff --git a/ge1mer/domofon_packages/output.yaml b/ge1mer/esphome/packages/output.yaml
similarity index 100%
rename from ge1mer/domofon_packages/output.yaml
rename to ge1mer/esphome/packages/output.yaml
diff --git a/ge1mer/domofon_packages/script.yaml b/ge1mer/esphome/packages/script.yaml
similarity index 100%
rename from ge1mer/domofon_packages/script.yaml
rename to ge1mer/esphome/packages/script.yaml
diff --git a/ge1mer/domofon_packages/switch.yaml b/ge1mer/esphome/packages/switch.yaml
similarity index 100%
rename from ge1mer/domofon_packages/switch.yaml
rename to ge1mer/esphome/packages/switch.yaml
diff --git a/ge1mer/domofon_packages/web_server.yaml b/ge1mer/esphome/packages/web_server.yaml
similarity index 100%
rename from ge1mer/domofon_packages/web_server.yaml
rename to ge1mer/esphome/packages/web_server.yaml