diff --git a/Template Project/lib/ESPMegaPRO/ClimateCard.cpp.d b/Template Project/lib/ESPMegaPRO/ClimateCard.cpp
similarity index 100%
rename from Template Project/lib/ESPMegaPRO/ClimateCard.cpp.d
rename to Template Project/lib/ESPMegaPRO/ClimateCard.cpp
diff --git a/Template Project/lib/ESPMegaPRO/ClimateCard.hpp.d b/Template Project/lib/ESPMegaPRO/ClimateCard.hpp
similarity index 99%
rename from Template Project/lib/ESPMegaPRO/ClimateCard.hpp.d
rename to Template Project/lib/ESPMegaPRO/ClimateCard.hpp
index 639d343..c7305a2 100644
--- a/Template Project/lib/ESPMegaPRO/ClimateCard.hpp.d	
+++ b/Template Project/lib/ESPMegaPRO/ClimateCard.hpp	
@@ -1,6 +1,6 @@
 #pragma once
 #include <ExpansionCard.hpp>
-#include <IRremote.hpp>
+#include <IRremote.h>
 #include <FRAM.h>
 #include <OneWire.h>
 #include <DS18B20.h>
diff --git a/Template Project/lib/ESPMegaPRO/ClimateIoT.cpp.d b/Template Project/lib/ESPMegaPRO/ClimateIoT.cpp
similarity index 100%
rename from Template Project/lib/ESPMegaPRO/ClimateIoT.cpp.d
rename to Template Project/lib/ESPMegaPRO/ClimateIoT.cpp
diff --git a/Template Project/lib/ESPMegaPRO/ClimateIoT.hpp.d b/Template Project/lib/ESPMegaPRO/ClimateIoT.hpp
similarity index 98%
rename from Template Project/lib/ESPMegaPRO/ClimateIoT.hpp.d
rename to Template Project/lib/ESPMegaPRO/ClimateIoT.hpp
index 1e80c1c..7d27c88 100644
--- a/Template Project/lib/ESPMegaPRO/ClimateIoT.hpp.d	
+++ b/Template Project/lib/ESPMegaPRO/ClimateIoT.hpp	
@@ -38,5 +38,4 @@ class ClimateIoT : public IoTComponent {
         bool processSetModeMessage(char *topic, char *payload, uint8_t topic_length);
         bool processSetFanSpeedMessage(char *topic, char *payload, uint8_t topic_length);
         bool processRequestStateMessage(char *topic, char *payload, uint8_t topic_length);
-        ClimateCard *card;
 };
\ No newline at end of file
diff --git a/Template Project/lib/ESPMegaPRO/ESPMegaPRO_OOP.hpp b/Template Project/lib/ESPMegaPRO/ESPMegaPRO_OOP.hpp
index 99b0c7d..f5162b4 100644
--- a/Template Project/lib/ESPMegaPRO/ESPMegaPRO_OOP.hpp	
+++ b/Template Project/lib/ESPMegaPRO/ESPMegaPRO_OOP.hpp	
@@ -2,6 +2,8 @@
 #include <ExpansionCard.hpp>
 #include <DigitalInputCard.hpp>
 #include <DigitalOutputCard.hpp>
+#include <ClimateCard.hpp>
+#include <AnalogCard.hpp>
 #include <ESPMegaIoT.hpp>
 #include <Arduino.h>
 #include <Wire.h>