diff --git a/lighting-remote/src/EspNowControl.cpp b/lib/EspNowLightControl/EspNowLightControlClient.cpp
similarity index 63%
rename from lighting-remote/src/EspNowControl.cpp
rename to lib/EspNowLightControl/EspNowLightControlClient.cpp
index ef6c21f..5d0248b 100644
--- a/lighting-remote/src/EspNowControl.cpp
+++ b/lib/EspNowLightControl/EspNowLightControlClient.cpp
@@ -1,18 +1,12 @@
-#ifndef EspNowControl_cpp
-#define EspNowControl_cpp
+#ifndef EspNowLightControlClient_cpp
+#define EspNowLightControlClient_cpp
 
 #include <esp_now.h>
 #include <WiFi.h>
+#include "LightControlPayload.cpp"
 
-class EspNowControl {
-	typedef struct payload {
-		int id;
-		bool on;
-		float brightness;
-		unsigned long timer;
-	} payload;
-	
-	uint8_t broadcastAddress[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+class EspNowLightControlClient {
+	uint8_t broadcastAddress[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
 public:
 	bool init() {
@@ -33,21 +27,21 @@ public:
 			return false;
 		}
 
-		return true;	
+		return true;
 	}
 
-	void send(){
-		for (int i=1; i<=5; i++){
-			payload data = payload();
+	void send() {
+		for (int i = 1; i <= 5; i++) {
+			LightControlPayload data = LightControlPayload();
 			data.id = i;
 			data.brightness = 1;
 			data.on = false;
 			data.timer = 0;
 
-			esp_err_t result = esp_now_send(broadcastAddress, (uint8_t *) &data, sizeof(data));
+			esp_err_t result = esp_now_send(broadcastAddress, (uint8_t*)&data, sizeof(data));
 			if (result == ESP_OK)
 				Serial.println("Sent with success");
-			else{
+			else {
 				Serial.println("Error sending the data");
 				Serial.println(esp_err_to_name(result));
 			}
diff --git a/lighting/src/EspNowControl.cpp b/lib/EspNowLightControl/EspNowLightControlServer.cpp
similarity index 70%
rename from lighting/src/EspNowControl.cpp
rename to lib/EspNowLightControl/EspNowLightControlServer.cpp
index a4c11ae..398b227 100644
--- a/lighting/src/EspNowControl.cpp
+++ b/lib/EspNowLightControl/EspNowLightControlServer.cpp
@@ -1,27 +1,21 @@
-#ifndef EspNowControl_cpp
-#define EspNowControl_cpp
+#ifndef EspNowLightControlServer_cpp
+#define EspNowLightControlServer_cpp
 
 #include <esp_now.h>
 #include <WiFi.h>
 #include "LedManager.cpp"
+#include "LightControlPayload.cpp"
 
-class EspNowControl {
-	typedef struct payload {
-		int id;
-		bool on;
-		float brightness;
-		unsigned long timer;
-	} payload;
-
+class EspNowLightControlServer {
 	static LedManager *_leds;
 
 	static void OnDataRecv(const uint8_t * mac, const uint8_t *incomingData, int len) {
-		payload data;
+		LightControlPayload data;
 		memcpy(&data, incomingData, sizeof(data));
 		_leds->setLedProperties(data.id, data.on, data.brightness, data.timer);
 	}
 
-	EspNowControl();
+	EspNowLightControlServer();
 
 public:
 	static bool init(LedManager *leds) {
diff --git a/lib/EspNowLightControl/LightControlPayload.cpp b/lib/EspNowLightControl/LightControlPayload.cpp
new file mode 100644
index 0000000..d5e7e92
--- /dev/null
+++ b/lib/EspNowLightControl/LightControlPayload.cpp
@@ -0,0 +1,11 @@
+#ifndef LightControlPayload_cpp
+#define LightControlPayload_cpp
+
+struct LightControlPayload {
+	int id;
+	bool on;
+	float brightness;
+	unsigned long timer;
+};
+
+#endif
diff --git a/lighting-remote/src/main.cpp b/lighting-remote/src/main.cpp
index b6b1c25..5c85a60 100644
--- a/lighting-remote/src/main.cpp
+++ b/lighting-remote/src/main.cpp
@@ -1,7 +1,7 @@
 #include <Arduino.h>
-#include "EspNowControl.cpp"
+#include "EspNowLightControlClient.cpp"
 
-EspNowControl _control;
+EspNowLightControlClient _control;
 
 void setup() {
 	Serial.begin(115200);
diff --git a/lighting/src/main.cpp b/lighting/src/main.cpp
index 28c254f..3f6744f 100644
--- a/lighting/src/main.cpp
+++ b/lighting/src/main.cpp
@@ -3,13 +3,13 @@
 #include "BluetoothLEDCallback.cpp"
 #include "BluetoothLightControl.cpp"
 #include "BluetoothService.cpp"
-#include "EspNowControl.cpp"
+#include "EspNowLightControlServer.cpp"
 #include "LedManager.cpp"
 #include "TimerManager.cpp"
 #include "TouchInput.cpp"
 #include <Arduino.h>
 
-LedManager *EspNowControl::_leds = 0; // WTF, C++?
+LedManager *EspNowLightControlServer::_leds = 0; // WTF, C++?
 
 #define FADE_IN_DURATION 500
 #define FADE_OUT_DURATION 1000
@@ -65,7 +65,7 @@ void setup() {
 
 	_btService.init();
 	_btService.start();
-	EspNowControl::init(&_leds);
+	EspNowLightControlServer::init(&_leds);
 }
 
 void loop() {