diff --git a/main/CMakeLists.txt b/app-esp/CMakeLists.txt
similarity index 100%
rename from main/CMakeLists.txt
rename to app-esp/CMakeLists.txt
diff --git a/main/Kconfig b/app-esp/Kconfig
similarity index 100%
rename from main/Kconfig
rename to app-esp/Kconfig
diff --git a/main/idf_component.yml b/app-esp/idf_component.yml
similarity index 100%
rename from main/idf_component.yml
rename to app-esp/idf_component.yml
diff --git a/main/src/board_config.h b/app-esp/src/board_config.h
similarity index 100%
rename from main/src/board_config.h
rename to app-esp/src/board_config.h
diff --git a/main/src/hello_world/hello_world.c b/app-esp/src/hello_world/hello_world.c
similarity index 100%
rename from main/src/hello_world/hello_world.c
rename to app-esp/src/hello_world/hello_world.c
diff --git a/main/src/hello_world/hello_world.h b/app-esp/src/hello_world/hello_world.h
similarity index 100%
rename from main/src/hello_world/hello_world.h
rename to app-esp/src/hello_world/hello_world.h
diff --git a/main/src/main.c b/app-esp/src/main.c
similarity index 100%
rename from main/src/main.c
rename to app-esp/src/main.c
diff --git a/components/mlib/CMakeLists.txt b/libs/mlib/CMakeLists.txt
similarity index 100%
rename from components/mlib/CMakeLists.txt
rename to libs/mlib/CMakeLists.txt
diff --git a/components/mlib/LICENSE b/libs/mlib/LICENSE
similarity index 100%
rename from components/mlib/LICENSE
rename to libs/mlib/LICENSE
diff --git a/components/mlib/README.md b/libs/mlib/README.md
similarity index 100%
rename from components/mlib/README.md
rename to libs/mlib/README.md
diff --git a/components/mlib/m-algo.h b/libs/mlib/m-algo.h
similarity index 100%
rename from components/mlib/m-algo.h
rename to libs/mlib/m-algo.h
diff --git a/components/mlib/m-array.h b/libs/mlib/m-array.h
similarity index 100%
rename from components/mlib/m-array.h
rename to libs/mlib/m-array.h
diff --git a/components/mlib/m-atomic.h b/libs/mlib/m-atomic.h
similarity index 100%
rename from components/mlib/m-atomic.h
rename to libs/mlib/m-atomic.h
diff --git a/components/mlib/m-bitset.h b/libs/mlib/m-bitset.h
similarity index 100%
rename from components/mlib/m-bitset.h
rename to libs/mlib/m-bitset.h
diff --git a/components/mlib/m-bptree.h b/libs/mlib/m-bptree.h
similarity index 100%
rename from components/mlib/m-bptree.h
rename to libs/mlib/m-bptree.h
diff --git a/components/mlib/m-buffer.h b/libs/mlib/m-buffer.h
similarity index 100%
rename from components/mlib/m-buffer.h
rename to libs/mlib/m-buffer.h
diff --git a/components/mlib/m-c-mempool.h b/libs/mlib/m-c-mempool.h
similarity index 100%
rename from components/mlib/m-c-mempool.h
rename to libs/mlib/m-c-mempool.h
diff --git a/components/mlib/m-concurrent.h b/libs/mlib/m-concurrent.h
similarity index 100%
rename from components/mlib/m-concurrent.h
rename to libs/mlib/m-concurrent.h
diff --git a/components/mlib/m-core.h b/libs/mlib/m-core.h
similarity index 100%
rename from components/mlib/m-core.h
rename to libs/mlib/m-core.h
diff --git a/components/mlib/m-deque.h b/libs/mlib/m-deque.h
similarity index 100%
rename from components/mlib/m-deque.h
rename to libs/mlib/m-deque.h
diff --git a/components/mlib/m-dict.h b/libs/mlib/m-dict.h
similarity index 100%
rename from components/mlib/m-dict.h
rename to libs/mlib/m-dict.h
diff --git a/components/mlib/m-funcobj.h b/libs/mlib/m-funcobj.h
similarity index 100%
rename from components/mlib/m-funcobj.h
rename to libs/mlib/m-funcobj.h
diff --git a/components/mlib/m-genint.h b/libs/mlib/m-genint.h
similarity index 100%
rename from components/mlib/m-genint.h
rename to libs/mlib/m-genint.h
diff --git a/components/mlib/m-i-list.h b/libs/mlib/m-i-list.h
similarity index 100%
rename from components/mlib/m-i-list.h
rename to libs/mlib/m-i-list.h
diff --git a/components/mlib/m-i-shared.h b/libs/mlib/m-i-shared.h
similarity index 100%
rename from components/mlib/m-i-shared.h
rename to libs/mlib/m-i-shared.h
diff --git a/components/mlib/m-list.h b/libs/mlib/m-list.h
similarity index 100%
rename from components/mlib/m-list.h
rename to libs/mlib/m-list.h
diff --git a/components/mlib/m-mempool.h b/libs/mlib/m-mempool.h
similarity index 100%
rename from components/mlib/m-mempool.h
rename to libs/mlib/m-mempool.h
diff --git a/components/mlib/m-mutex.h b/libs/mlib/m-mutex.h
similarity index 100%
rename from components/mlib/m-mutex.h
rename to libs/mlib/m-mutex.h
diff --git a/components/mlib/m-prioqueue.h b/libs/mlib/m-prioqueue.h
similarity index 100%
rename from components/mlib/m-prioqueue.h
rename to libs/mlib/m-prioqueue.h
diff --git a/components/mlib/m-rbtree.h b/libs/mlib/m-rbtree.h
similarity index 100%
rename from components/mlib/m-rbtree.h
rename to libs/mlib/m-rbtree.h
diff --git a/components/mlib/m-serial-bin.h b/libs/mlib/m-serial-bin.h
similarity index 100%
rename from components/mlib/m-serial-bin.h
rename to libs/mlib/m-serial-bin.h
diff --git a/components/mlib/m-serial-json.h b/libs/mlib/m-serial-json.h
similarity index 100%
rename from components/mlib/m-serial-json.h
rename to libs/mlib/m-serial-json.h
diff --git a/components/mlib/m-shared.h b/libs/mlib/m-shared.h
similarity index 100%
rename from components/mlib/m-shared.h
rename to libs/mlib/m-shared.h
diff --git a/components/mlib/m-snapshot.h b/libs/mlib/m-snapshot.h
similarity index 100%
rename from components/mlib/m-snapshot.h
rename to libs/mlib/m-snapshot.h
diff --git a/components/mlib/m-string.h b/libs/mlib/m-string.h
similarity index 100%
rename from components/mlib/m-string.h
rename to libs/mlib/m-string.h
diff --git a/components/mlib/m-thread.h b/libs/mlib/m-thread.h
similarity index 100%
rename from components/mlib/m-thread.h
rename to libs/mlib/m-thread.h
diff --git a/components/mlib/m-tree.h b/libs/mlib/m-tree.h
similarity index 100%
rename from components/mlib/m-tree.h
rename to libs/mlib/m-tree.h
diff --git a/components/mlib/m-try.h b/libs/mlib/m-try.h
similarity index 100%
rename from components/mlib/m-try.h
rename to libs/mlib/m-try.h
diff --git a/components/mlib/m-tuple.h b/libs/mlib/m-tuple.h
similarity index 100%
rename from components/mlib/m-tuple.h
rename to libs/mlib/m-tuple.h
diff --git a/components/mlib/m-variant.h b/libs/mlib/m-variant.h
similarity index 100%
rename from components/mlib/m-variant.h
rename to libs/mlib/m-variant.h
diff --git a/components/mlib/m-worker.h b/libs/mlib/m-worker.h
similarity index 100%
rename from components/mlib/m-worker.h
rename to libs/mlib/m-worker.h
diff --git a/components/tactility-core/CMakeLists.txt b/libs/tactility-core/CMakeLists.txt
similarity index 100%
rename from components/tactility-core/CMakeLists.txt
rename to libs/tactility-core/CMakeLists.txt
diff --git a/components/tactility-core/LICENSE.md b/libs/tactility-core/LICENSE.md
similarity index 100%
rename from components/tactility-core/LICENSE.md
rename to libs/tactility-core/LICENSE.md
diff --git a/components/tactility-core/README.md b/libs/tactility-core/README.md
similarity index 100%
rename from components/tactility-core/README.md
rename to libs/tactility-core/README.md
diff --git a/components/tactility-core/src/api_lock.h b/libs/tactility-core/src/api_lock.h
similarity index 100%
rename from components/tactility-core/src/api_lock.h
rename to libs/tactility-core/src/api_lock.h
diff --git a/components/tactility-core/src/app.c b/libs/tactility-core/src/app.c
similarity index 100%
rename from components/tactility-core/src/app.c
rename to libs/tactility-core/src/app.c
diff --git a/components/tactility-core/src/app.h b/libs/tactility-core/src/app.h
similarity index 100%
rename from components/tactility-core/src/app.h
rename to libs/tactility-core/src/app.h
diff --git a/components/tactility-core/src/app_i.h b/libs/tactility-core/src/app_i.h
similarity index 100%
rename from components/tactility-core/src/app_i.h
rename to libs/tactility-core/src/app_i.h
diff --git a/components/tactility-core/src/app_manifest.h b/libs/tactility-core/src/app_manifest.h
similarity index 100%
rename from components/tactility-core/src/app_manifest.h
rename to libs/tactility-core/src/app_manifest.h
diff --git a/components/tactility-core/src/app_manifest_registry.c b/libs/tactility-core/src/app_manifest_registry.c
similarity index 100%
rename from components/tactility-core/src/app_manifest_registry.c
rename to libs/tactility-core/src/app_manifest_registry.c
diff --git a/components/tactility-core/src/app_manifest_registry.h b/libs/tactility-core/src/app_manifest_registry.h
similarity index 100%
rename from components/tactility-core/src/app_manifest_registry.h
rename to libs/tactility-core/src/app_manifest_registry.h
diff --git a/components/tactility-core/src/bundle.c b/libs/tactility-core/src/bundle.c
similarity index 100%
rename from components/tactility-core/src/bundle.c
rename to libs/tactility-core/src/bundle.c
diff --git a/components/tactility-core/src/bundle.h b/libs/tactility-core/src/bundle.h
similarity index 100%
rename from components/tactility-core/src/bundle.h
rename to libs/tactility-core/src/bundle.h
diff --git a/components/tactility-core/src/check.c b/libs/tactility-core/src/check.c
similarity index 100%
rename from components/tactility-core/src/check.c
rename to libs/tactility-core/src/check.c
diff --git a/components/tactility-core/src/check.h b/libs/tactility-core/src/check.h
similarity index 100%
rename from components/tactility-core/src/check.h
rename to libs/tactility-core/src/check.h
diff --git a/components/tactility-core/src/core.c b/libs/tactility-core/src/core.c
similarity index 100%
rename from components/tactility-core/src/core.c
rename to libs/tactility-core/src/core.c
diff --git a/components/tactility-core/src/core.h b/libs/tactility-core/src/core.h
similarity index 100%
rename from components/tactility-core/src/core.h
rename to libs/tactility-core/src/core.h
diff --git a/components/tactility-core/src/core_defines.h b/libs/tactility-core/src/core_defines.h
similarity index 100%
rename from components/tactility-core/src/core_defines.h
rename to libs/tactility-core/src/core_defines.h
diff --git a/components/tactility-core/src/core_extra_defines.h b/libs/tactility-core/src/core_extra_defines.h
similarity index 100%
rename from components/tactility-core/src/core_extra_defines.h
rename to libs/tactility-core/src/core_extra_defines.h
diff --git a/components/tactility-core/src/core_types.h b/libs/tactility-core/src/core_types.h
similarity index 100%
rename from components/tactility-core/src/core_types.h
rename to libs/tactility-core/src/core_types.h
diff --git a/components/tactility-core/src/critical.c b/libs/tactility-core/src/critical.c
similarity index 100%
rename from components/tactility-core/src/critical.c
rename to libs/tactility-core/src/critical.c
diff --git a/components/tactility-core/src/critical.h b/libs/tactility-core/src/critical.h
similarity index 100%
rename from components/tactility-core/src/critical.h
rename to libs/tactility-core/src/critical.h
diff --git a/components/tactility-core/src/event_flag.c b/libs/tactility-core/src/event_flag.c
similarity index 100%
rename from components/tactility-core/src/event_flag.c
rename to libs/tactility-core/src/event_flag.c
diff --git a/components/tactility-core/src/event_flag.h b/libs/tactility-core/src/event_flag.h
similarity index 100%
rename from components/tactility-core/src/event_flag.h
rename to libs/tactility-core/src/event_flag.h
diff --git a/components/tactility-core/src/hash.c b/libs/tactility-core/src/hash.c
similarity index 100%
rename from components/tactility-core/src/hash.c
rename to libs/tactility-core/src/hash.c
diff --git a/components/tactility-core/src/hash.h b/libs/tactility-core/src/hash.h
similarity index 100%
rename from components/tactility-core/src/hash.h
rename to libs/tactility-core/src/hash.h
diff --git a/components/tactility-core/src/kernel.c b/libs/tactility-core/src/kernel.c
similarity index 100%
rename from components/tactility-core/src/kernel.c
rename to libs/tactility-core/src/kernel.c
diff --git a/components/tactility-core/src/kernel.h b/libs/tactility-core/src/kernel.h
similarity index 100%
rename from components/tactility-core/src/kernel.h
rename to libs/tactility-core/src/kernel.h
diff --git a/components/tactility-core/src/log.h b/libs/tactility-core/src/log.h
similarity index 100%
rename from components/tactility-core/src/log.h
rename to libs/tactility-core/src/log.h
diff --git a/components/tactility-core/src/m_cstr_dup.h b/libs/tactility-core/src/m_cstr_dup.h
similarity index 100%
rename from components/tactility-core/src/m_cstr_dup.h
rename to libs/tactility-core/src/m_cstr_dup.h
diff --git a/components/tactility-core/src/message_queue.c b/libs/tactility-core/src/message_queue.c
similarity index 100%
rename from components/tactility-core/src/message_queue.c
rename to libs/tactility-core/src/message_queue.c
diff --git a/components/tactility-core/src/message_queue.h b/libs/tactility-core/src/message_queue.h
similarity index 100%
rename from components/tactility-core/src/message_queue.h
rename to libs/tactility-core/src/message_queue.h
diff --git a/components/tactility-core/src/mutex.c b/libs/tactility-core/src/mutex.c
similarity index 100%
rename from components/tactility-core/src/mutex.c
rename to libs/tactility-core/src/mutex.c
diff --git a/components/tactility-core/src/mutex.h b/libs/tactility-core/src/mutex.h
similarity index 100%
rename from components/tactility-core/src/mutex.h
rename to libs/tactility-core/src/mutex.h
diff --git a/components/tactility-core/src/pubsub.c b/libs/tactility-core/src/pubsub.c
similarity index 100%
rename from components/tactility-core/src/pubsub.c
rename to libs/tactility-core/src/pubsub.c
diff --git a/components/tactility-core/src/pubsub.h b/libs/tactility-core/src/pubsub.h
similarity index 100%
rename from components/tactility-core/src/pubsub.h
rename to libs/tactility-core/src/pubsub.h
diff --git a/components/tactility-core/src/secure.c b/libs/tactility-core/src/secure.c
similarity index 100%
rename from components/tactility-core/src/secure.c
rename to libs/tactility-core/src/secure.c
diff --git a/components/tactility-core/src/secure.h b/libs/tactility-core/src/secure.h
similarity index 100%
rename from components/tactility-core/src/secure.h
rename to libs/tactility-core/src/secure.h
diff --git a/components/tactility-core/src/semaphore.c b/libs/tactility-core/src/semaphore.c
similarity index 100%
rename from components/tactility-core/src/semaphore.c
rename to libs/tactility-core/src/semaphore.c
diff --git a/components/tactility-core/src/semaphore.h b/libs/tactility-core/src/semaphore.h
similarity index 100%
rename from components/tactility-core/src/semaphore.h
rename to libs/tactility-core/src/semaphore.h
diff --git a/components/tactility-core/src/service.c b/libs/tactility-core/src/service.c
similarity index 100%
rename from components/tactility-core/src/service.c
rename to libs/tactility-core/src/service.c
diff --git a/components/tactility-core/src/service.h b/libs/tactility-core/src/service.h
similarity index 100%
rename from components/tactility-core/src/service.h
rename to libs/tactility-core/src/service.h
diff --git a/components/tactility-core/src/service_i.h b/libs/tactility-core/src/service_i.h
similarity index 100%
rename from components/tactility-core/src/service_i.h
rename to libs/tactility-core/src/service_i.h
diff --git a/components/tactility-core/src/service_manifest.h b/libs/tactility-core/src/service_manifest.h
similarity index 100%
rename from components/tactility-core/src/service_manifest.h
rename to libs/tactility-core/src/service_manifest.h
diff --git a/components/tactility-core/src/service_registry.c b/libs/tactility-core/src/service_registry.c
similarity index 100%
rename from components/tactility-core/src/service_registry.c
rename to libs/tactility-core/src/service_registry.c
diff --git a/components/tactility-core/src/service_registry.h b/libs/tactility-core/src/service_registry.h
similarity index 100%
rename from components/tactility-core/src/service_registry.h
rename to libs/tactility-core/src/service_registry.h
diff --git a/components/tactility-core/src/stream_buffer.c b/libs/tactility-core/src/stream_buffer.c
similarity index 100%
rename from components/tactility-core/src/stream_buffer.c
rename to libs/tactility-core/src/stream_buffer.c
diff --git a/components/tactility-core/src/stream_buffer.h b/libs/tactility-core/src/stream_buffer.h
similarity index 100%
rename from components/tactility-core/src/stream_buffer.h
rename to libs/tactility-core/src/stream_buffer.h
diff --git a/components/tactility-core/src/tactility_core.h b/libs/tactility-core/src/tactility_core.h
similarity index 100%
rename from components/tactility-core/src/tactility_core.h
rename to libs/tactility-core/src/tactility_core.h
diff --git a/components/tactility-core/src/tactility_core_config.h b/libs/tactility-core/src/tactility_core_config.h
similarity index 100%
rename from components/tactility-core/src/tactility_core_config.h
rename to libs/tactility-core/src/tactility_core_config.h
diff --git a/components/tactility-core/src/thread.c b/libs/tactility-core/src/thread.c
similarity index 100%
rename from components/tactility-core/src/thread.c
rename to libs/tactility-core/src/thread.c
diff --git a/components/tactility-core/src/thread.h b/libs/tactility-core/src/thread.h
similarity index 100%
rename from components/tactility-core/src/thread.h
rename to libs/tactility-core/src/thread.h
diff --git a/components/tactility-core/src/timer.c b/libs/tactility-core/src/timer.c
similarity index 100%
rename from components/tactility-core/src/timer.c
rename to libs/tactility-core/src/timer.c
diff --git a/components/tactility-core/src/timer.h b/libs/tactility-core/src/timer.h
similarity index 100%
rename from components/tactility-core/src/timer.h
rename to libs/tactility-core/src/timer.h
diff --git a/components/tactility/CMakeLists.txt b/libs/tactility/CMakeLists.txt
similarity index 100%
rename from components/tactility/CMakeLists.txt
rename to libs/tactility/CMakeLists.txt
diff --git a/components/tactility/assets/ic_small_wifi_off.png b/libs/tactility/assets/ic_small_wifi_off.png
similarity index 100%
rename from components/tactility/assets/ic_small_wifi_off.png
rename to libs/tactility/assets/ic_small_wifi_off.png
diff --git a/components/tactility/assets/ic_small_wifi_on.png b/libs/tactility/assets/ic_small_wifi_on.png
similarity index 100%
rename from components/tactility/assets/ic_small_wifi_on.png
rename to libs/tactility/assets/ic_small_wifi_on.png
diff --git a/components/tactility/assets/network_wifi.png b/libs/tactility/assets/network_wifi.png
similarity index 100%
rename from components/tactility/assets/network_wifi.png
rename to libs/tactility/assets/network_wifi.png
diff --git a/components/tactility/assets/network_wifi_1_bar.png b/libs/tactility/assets/network_wifi_1_bar.png
similarity index 100%
rename from components/tactility/assets/network_wifi_1_bar.png
rename to libs/tactility/assets/network_wifi_1_bar.png
diff --git a/components/tactility/assets/network_wifi_1_bar_locked.png b/libs/tactility/assets/network_wifi_1_bar_locked.png
similarity index 100%
rename from components/tactility/assets/network_wifi_1_bar_locked.png
rename to libs/tactility/assets/network_wifi_1_bar_locked.png
diff --git a/components/tactility/assets/network_wifi_2_bar.png b/libs/tactility/assets/network_wifi_2_bar.png
similarity index 100%
rename from components/tactility/assets/network_wifi_2_bar.png
rename to libs/tactility/assets/network_wifi_2_bar.png
diff --git a/components/tactility/assets/network_wifi_2_bar_locked.png b/libs/tactility/assets/network_wifi_2_bar_locked.png
similarity index 100%
rename from components/tactility/assets/network_wifi_2_bar_locked.png
rename to libs/tactility/assets/network_wifi_2_bar_locked.png
diff --git a/components/tactility/assets/network_wifi_3_bar.png b/libs/tactility/assets/network_wifi_3_bar.png
similarity index 100%
rename from components/tactility/assets/network_wifi_3_bar.png
rename to libs/tactility/assets/network_wifi_3_bar.png
diff --git a/components/tactility/assets/network_wifi_3_bar_locked.png b/libs/tactility/assets/network_wifi_3_bar_locked.png
similarity index 100%
rename from components/tactility/assets/network_wifi_3_bar_locked.png
rename to libs/tactility/assets/network_wifi_3_bar_locked.png
diff --git a/components/tactility/assets/network_wifi_locked.png b/libs/tactility/assets/network_wifi_locked.png
similarity index 100%
rename from components/tactility/assets/network_wifi_locked.png
rename to libs/tactility/assets/network_wifi_locked.png
diff --git a/components/tactility/config/placeholder.txt b/libs/tactility/config/placeholder.txt
similarity index 100%
rename from components/tactility/config/placeholder.txt
rename to libs/tactility/config/placeholder.txt
diff --git a/components/tactility/src/apps/desktop/desktop.c b/libs/tactility/src/apps/desktop/desktop.c
similarity index 100%
rename from components/tactility/src/apps/desktop/desktop.c
rename to libs/tactility/src/apps/desktop/desktop.c
diff --git a/components/tactility/src/apps/system/system_info/system_info.c b/libs/tactility/src/apps/system/system_info/system_info.c
similarity index 100%
rename from components/tactility/src/apps/system/system_info/system_info.c
rename to libs/tactility/src/apps/system/system_info/system_info.c
diff --git a/components/tactility/src/apps/system/wifi_connect/wifi_connect.c b/libs/tactility/src/apps/system/wifi_connect/wifi_connect.c
similarity index 100%
rename from components/tactility/src/apps/system/wifi_connect/wifi_connect.c
rename to libs/tactility/src/apps/system/wifi_connect/wifi_connect.c
diff --git a/components/tactility/src/apps/system/wifi_connect/wifi_connect.h b/libs/tactility/src/apps/system/wifi_connect/wifi_connect.h
similarity index 100%
rename from components/tactility/src/apps/system/wifi_connect/wifi_connect.h
rename to libs/tactility/src/apps/system/wifi_connect/wifi_connect.h
diff --git a/components/tactility/src/apps/system/wifi_connect/wifi_connect_bindings.h b/libs/tactility/src/apps/system/wifi_connect/wifi_connect_bindings.h
similarity index 100%
rename from components/tactility/src/apps/system/wifi_connect/wifi_connect_bindings.h
rename to libs/tactility/src/apps/system/wifi_connect/wifi_connect_bindings.h
diff --git a/components/tactility/src/apps/system/wifi_connect/wifi_connect_bundle.h b/libs/tactility/src/apps/system/wifi_connect/wifi_connect_bundle.h
similarity index 100%
rename from components/tactility/src/apps/system/wifi_connect/wifi_connect_bundle.h
rename to libs/tactility/src/apps/system/wifi_connect/wifi_connect_bundle.h
diff --git a/components/tactility/src/apps/system/wifi_connect/wifi_connect_state.h b/libs/tactility/src/apps/system/wifi_connect/wifi_connect_state.h
similarity index 100%
rename from components/tactility/src/apps/system/wifi_connect/wifi_connect_state.h
rename to libs/tactility/src/apps/system/wifi_connect/wifi_connect_state.h
diff --git a/components/tactility/src/apps/system/wifi_connect/wifi_connect_state_updating.c b/libs/tactility/src/apps/system/wifi_connect/wifi_connect_state_updating.c
similarity index 100%
rename from components/tactility/src/apps/system/wifi_connect/wifi_connect_state_updating.c
rename to libs/tactility/src/apps/system/wifi_connect/wifi_connect_state_updating.c
diff --git a/components/tactility/src/apps/system/wifi_connect/wifi_connect_state_updating.h b/libs/tactility/src/apps/system/wifi_connect/wifi_connect_state_updating.h
similarity index 100%
rename from components/tactility/src/apps/system/wifi_connect/wifi_connect_state_updating.h
rename to libs/tactility/src/apps/system/wifi_connect/wifi_connect_state_updating.h
diff --git a/components/tactility/src/apps/system/wifi_connect/wifi_connect_view.c b/libs/tactility/src/apps/system/wifi_connect/wifi_connect_view.c
similarity index 100%
rename from components/tactility/src/apps/system/wifi_connect/wifi_connect_view.c
rename to libs/tactility/src/apps/system/wifi_connect/wifi_connect_view.c
diff --git a/components/tactility/src/apps/system/wifi_connect/wifi_connect_view.h b/libs/tactility/src/apps/system/wifi_connect/wifi_connect_view.h
similarity index 100%
rename from components/tactility/src/apps/system/wifi_connect/wifi_connect_view.h
rename to libs/tactility/src/apps/system/wifi_connect/wifi_connect_view.h
diff --git a/components/tactility/src/apps/system/wifi_manage/wifi_manage.c b/libs/tactility/src/apps/system/wifi_manage/wifi_manage.c
similarity index 100%
rename from components/tactility/src/apps/system/wifi_manage/wifi_manage.c
rename to libs/tactility/src/apps/system/wifi_manage/wifi_manage.c
diff --git a/components/tactility/src/apps/system/wifi_manage/wifi_manage.h b/libs/tactility/src/apps/system/wifi_manage/wifi_manage.h
similarity index 100%
rename from components/tactility/src/apps/system/wifi_manage/wifi_manage.h
rename to libs/tactility/src/apps/system/wifi_manage/wifi_manage.h
diff --git a/components/tactility/src/apps/system/wifi_manage/wifi_manage_bindings.h b/libs/tactility/src/apps/system/wifi_manage/wifi_manage_bindings.h
similarity index 100%
rename from components/tactility/src/apps/system/wifi_manage/wifi_manage_bindings.h
rename to libs/tactility/src/apps/system/wifi_manage/wifi_manage_bindings.h
diff --git a/components/tactility/src/apps/system/wifi_manage/wifi_manage_state.h b/libs/tactility/src/apps/system/wifi_manage/wifi_manage_state.h
similarity index 100%
rename from components/tactility/src/apps/system/wifi_manage/wifi_manage_state.h
rename to libs/tactility/src/apps/system/wifi_manage/wifi_manage_state.h
diff --git a/components/tactility/src/apps/system/wifi_manage/wifi_manage_state_updating.c b/libs/tactility/src/apps/system/wifi_manage/wifi_manage_state_updating.c
similarity index 100%
rename from components/tactility/src/apps/system/wifi_manage/wifi_manage_state_updating.c
rename to libs/tactility/src/apps/system/wifi_manage/wifi_manage_state_updating.c
diff --git a/components/tactility/src/apps/system/wifi_manage/wifi_manage_state_updating.h b/libs/tactility/src/apps/system/wifi_manage/wifi_manage_state_updating.h
similarity index 100%
rename from components/tactility/src/apps/system/wifi_manage/wifi_manage_state_updating.h
rename to libs/tactility/src/apps/system/wifi_manage/wifi_manage_state_updating.h
diff --git a/components/tactility/src/apps/system/wifi_manage/wifi_manage_view.c b/libs/tactility/src/apps/system/wifi_manage/wifi_manage_view.c
similarity index 100%
rename from components/tactility/src/apps/system/wifi_manage/wifi_manage_view.c
rename to libs/tactility/src/apps/system/wifi_manage/wifi_manage_view.c
diff --git a/components/tactility/src/apps/system/wifi_manage/wifi_manage_view.h b/libs/tactility/src/apps/system/wifi_manage/wifi_manage_view.h
similarity index 100%
rename from components/tactility/src/apps/system/wifi_manage/wifi_manage_view.h
rename to libs/tactility/src/apps/system/wifi_manage/wifi_manage_view.h
diff --git a/components/tactility/src/devices.c b/libs/tactility/src/devices.c
similarity index 100%
rename from components/tactility/src/devices.c
rename to libs/tactility/src/devices.c
diff --git a/components/tactility/src/devices.h b/libs/tactility/src/devices.h
similarity index 100%
rename from components/tactility/src/devices.h
rename to libs/tactility/src/devices.h
diff --git a/components/tactility/src/devices_i.h b/libs/tactility/src/devices_i.h
similarity index 100%
rename from components/tactility/src/devices_i.h
rename to libs/tactility/src/devices_i.h
diff --git a/components/tactility/src/display.c b/libs/tactility/src/display.c
similarity index 100%
rename from components/tactility/src/display.c
rename to libs/tactility/src/display.c
diff --git a/components/tactility/src/display.h b/libs/tactility/src/display.h
similarity index 100%
rename from components/tactility/src/display.h
rename to libs/tactility/src/display.h
diff --git a/components/tactility/src/graphics.c b/libs/tactility/src/graphics.c
similarity index 100%
rename from components/tactility/src/graphics.c
rename to libs/tactility/src/graphics.c
diff --git a/components/tactility/src/graphics.h b/libs/tactility/src/graphics.h
similarity index 100%
rename from components/tactility/src/graphics.h
rename to libs/tactility/src/graphics.h
diff --git a/components/tactility/src/graphics_i.h b/libs/tactility/src/graphics_i.h
similarity index 100%
rename from components/tactility/src/graphics_i.h
rename to libs/tactility/src/graphics_i.h
diff --git a/components/tactility/src/partitions.c b/libs/tactility/src/partitions.c
similarity index 100%
rename from components/tactility/src/partitions.c
rename to libs/tactility/src/partitions.c
diff --git a/components/tactility/src/partitions.h b/libs/tactility/src/partitions.h
similarity index 100%
rename from components/tactility/src/partitions.h
rename to libs/tactility/src/partitions.h
diff --git a/components/tactility/src/services/gui/gui.c b/libs/tactility/src/services/gui/gui.c
similarity index 100%
rename from components/tactility/src/services/gui/gui.c
rename to libs/tactility/src/services/gui/gui.c
diff --git a/components/tactility/src/services/gui/gui.h b/libs/tactility/src/services/gui/gui.h
similarity index 100%
rename from components/tactility/src/services/gui/gui.h
rename to libs/tactility/src/services/gui/gui.h
diff --git a/components/tactility/src/services/gui/gui_draw.c b/libs/tactility/src/services/gui/gui_draw.c
similarity index 100%
rename from components/tactility/src/services/gui/gui_draw.c
rename to libs/tactility/src/services/gui/gui_draw.c
diff --git a/components/tactility/src/services/gui/gui_i.h b/libs/tactility/src/services/gui/gui_i.h
similarity index 100%
rename from components/tactility/src/services/gui/gui_i.h
rename to libs/tactility/src/services/gui/gui_i.h
diff --git a/components/tactility/src/services/gui/icon.c b/libs/tactility/src/services/gui/icon.c
similarity index 100%
rename from components/tactility/src/services/gui/icon.c
rename to libs/tactility/src/services/gui/icon.c
diff --git a/components/tactility/src/services/gui/icon.h b/libs/tactility/src/services/gui/icon.h
similarity index 100%
rename from components/tactility/src/services/gui/icon.h
rename to libs/tactility/src/services/gui/icon.h
diff --git a/components/tactility/src/services/gui/icon_i.h b/libs/tactility/src/services/gui/icon_i.h
similarity index 100%
rename from components/tactility/src/services/gui/icon_i.h
rename to libs/tactility/src/services/gui/icon_i.h
diff --git a/components/tactility/src/services/gui/view_port.c b/libs/tactility/src/services/gui/view_port.c
similarity index 100%
rename from components/tactility/src/services/gui/view_port.c
rename to libs/tactility/src/services/gui/view_port.c
diff --git a/components/tactility/src/services/gui/view_port.h b/libs/tactility/src/services/gui/view_port.h
similarity index 100%
rename from components/tactility/src/services/gui/view_port.h
rename to libs/tactility/src/services/gui/view_port.h
diff --git a/components/tactility/src/services/gui/view_port_i.h b/libs/tactility/src/services/gui/view_port_i.h
similarity index 100%
rename from components/tactility/src/services/gui/view_port_i.h
rename to libs/tactility/src/services/gui/view_port_i.h
diff --git a/components/tactility/src/services/gui/widgets/statusbar.c b/libs/tactility/src/services/gui/widgets/statusbar.c
similarity index 100%
rename from components/tactility/src/services/gui/widgets/statusbar.c
rename to libs/tactility/src/services/gui/widgets/statusbar.c
diff --git a/components/tactility/src/services/gui/widgets/statusbar.h b/libs/tactility/src/services/gui/widgets/statusbar.h
similarity index 100%
rename from components/tactility/src/services/gui/widgets/statusbar.h
rename to libs/tactility/src/services/gui/widgets/statusbar.h
diff --git a/components/tactility/src/services/loader/loader.c b/libs/tactility/src/services/loader/loader.c
similarity index 100%
rename from components/tactility/src/services/loader/loader.c
rename to libs/tactility/src/services/loader/loader.c
diff --git a/components/tactility/src/services/loader/loader.h b/libs/tactility/src/services/loader/loader.h
similarity index 100%
rename from components/tactility/src/services/loader/loader.h
rename to libs/tactility/src/services/loader/loader.h
diff --git a/components/tactility/src/services/loader/loader_i.h b/libs/tactility/src/services/loader/loader_i.h
similarity index 100%
rename from components/tactility/src/services/loader/loader_i.h
rename to libs/tactility/src/services/loader/loader_i.h
diff --git a/components/tactility/src/services/wifi/wifi.c b/libs/tactility/src/services/wifi/wifi.c
similarity index 100%
rename from components/tactility/src/services/wifi/wifi.c
rename to libs/tactility/src/services/wifi/wifi.c
diff --git a/components/tactility/src/services/wifi/wifi.h b/libs/tactility/src/services/wifi/wifi.h
similarity index 100%
rename from components/tactility/src/services/wifi/wifi.h
rename to libs/tactility/src/services/wifi/wifi.h
diff --git a/components/tactility/src/services/wifi/wifi_credentials.c b/libs/tactility/src/services/wifi/wifi_credentials.c
similarity index 100%
rename from components/tactility/src/services/wifi/wifi_credentials.c
rename to libs/tactility/src/services/wifi/wifi_credentials.c
diff --git a/components/tactility/src/services/wifi/wifi_credentials.h b/libs/tactility/src/services/wifi/wifi_credentials.h
similarity index 100%
rename from components/tactility/src/services/wifi/wifi_credentials.h
rename to libs/tactility/src/services/wifi/wifi_credentials.h
diff --git a/components/tactility/src/tactility.c b/libs/tactility/src/tactility.c
similarity index 100%
rename from components/tactility/src/tactility.c
rename to libs/tactility/src/tactility.c
diff --git a/components/tactility/src/tactility.h b/libs/tactility/src/tactility.h
similarity index 100%
rename from components/tactility/src/tactility.h
rename to libs/tactility/src/tactility.h
diff --git a/components/tactility/src/touch.c b/libs/tactility/src/touch.c
similarity index 100%
rename from components/tactility/src/touch.c
rename to libs/tactility/src/touch.c
diff --git a/components/tactility/src/touch.h b/libs/tactility/src/touch.h
similarity index 100%
rename from components/tactility/src/touch.h
rename to libs/tactility/src/touch.h
diff --git a/components/tactility/src/ui/spacer.c b/libs/tactility/src/ui/spacer.c
similarity index 100%
rename from components/tactility/src/ui/spacer.c
rename to libs/tactility/src/ui/spacer.c
diff --git a/components/tactility/src/ui/spacer.h b/libs/tactility/src/ui/spacer.h
similarity index 100%
rename from components/tactility/src/ui/spacer.h
rename to libs/tactility/src/ui/spacer.h
diff --git a/components/tactility/src/ui/style.c b/libs/tactility/src/ui/style.c
similarity index 100%
rename from components/tactility/src/ui/style.c
rename to libs/tactility/src/ui/style.c
diff --git a/components/tactility/src/ui/style.h b/libs/tactility/src/ui/style.h
similarity index 100%
rename from components/tactility/src/ui/style.h
rename to libs/tactility/src/ui/style.h
diff --git a/components/tactility/src/ui/toolbar.c b/libs/tactility/src/ui/toolbar.c
similarity index 100%
rename from components/tactility/src/ui/toolbar.c
rename to libs/tactility/src/ui/toolbar.c
diff --git a/components/tactility/src/ui/toolbar.h b/libs/tactility/src/ui/toolbar.h
similarity index 100%
rename from components/tactility/src/ui/toolbar.h
rename to libs/tactility/src/ui/toolbar.h