diff --git a/device/main/CMakeLists.txt b/device/main/CMakeLists.txt
index 1d84c4c..d3b02df 100644
--- a/device/main/CMakeLists.txt
+++ b/device/main/CMakeLists.txt
@@ -1,2 +1,2 @@
-idf_component_register(SRCS "main.cpp" "WebInterface.cpp"
+idf_component_register(SRCS "Networking.cpp" "main.cpp" "WebInterface.cpp"
     INCLUDE_DIRS ".")
diff --git a/device/main/Networking.cpp b/device/main/Networking.cpp
new file mode 100644
index 0000000..0b72c6f
--- /dev/null
+++ b/device/main/Networking.cpp
@@ -0,0 +1,15 @@
+#include "Networking.hpp"
+
+#include "WiFi.h"
+
+void Networking::connectWifi() {
+	WiFi.begin(CONFIG_ESP_WIFI_SSID, CONFIG_ESP_WIFI_PASSWORD);
+
+    while (WiFi.status() != WL_CONNECTED) {
+        delay(1000);
+        Serial.println("Waiting for connection...");
+    }
+
+    Serial.println("Connected.");
+    Serial.println(WiFi.localIP());
+}
\ No newline at end of file
diff --git a/device/main/Networking.hpp b/device/main/Networking.hpp
new file mode 100644
index 0000000..a566246
--- /dev/null
+++ b/device/main/Networking.hpp
@@ -0,0 +1,9 @@
+#ifndef _NETWORKING_HPP
+#define _NETWORKING_HPP
+
+class Networking {
+	public:
+		void connectWifi();
+};
+
+#endif
\ No newline at end of file
diff --git a/device/main/main.cpp b/device/main/main.cpp
index a8bfe7f..76184f6 100644
--- a/device/main/main.cpp
+++ b/device/main/main.cpp
@@ -2,24 +2,14 @@
 
 #include <WiFi.h>
 
+#include "Networking.hpp"
 #include "WebInterface.hpp"
 
 extern "C" {
     void app_main();
 }
 
-void connectWifi() {
-    WiFi.begin(CONFIG_ESP_WIFI_SSID, CONFIG_ESP_WIFI_PASSWORD);
-
-    while (WiFi.status() != WL_CONNECTED) {
-        delay(1000);
-        Serial.println("Waiting for connection...");
-    }
-
-    Serial.println("Connected.");
-    Serial.println(WiFi.localIP());
-}
-
+Networking networking;
 WebInterface webInterface;
 
 void app_main(void) {
@@ -27,7 +17,7 @@ void app_main(void) {
 
     Serial.begin(115200);
 
-    connectWifi();
+    networking.connectWifi();
 
     webInterface.start();
 }