diff --git a/include/initialization_state.h b/include/initialization_state.h
index 9e2e8c0..edc53e7 100644
--- a/include/initialization_state.h
+++ b/include/initialization_state.h
@@ -1,35 +1,19 @@
-#include "initialization_state.h"
-#include "motor_controller.h"
+#ifndef INITIALIZATION_STATE_H
+#define INITIALIZATION_STATE_H
 
-#include <Arduino.h>
+#include "state.h"
 
 
-void InitializationState::enter()
+class InitializationState : public State
 {
-    Serial.println();
-    Serial.println("State: Initialization");
+public:
+    void enter() override;
 
-    digitalWrite(LED_BUILTIN, LOW);
+    void update() override;
 
-    context->stop_motor();
+    void command(char c) override;
 
-    context->reset_speed_measurement();
+    void exit() override;
+};
 
-    Serial.println("Boot-up");
-}
-
-
-void InitializationState::update()
-{
-    context->to_operational();
-}
-
-
-void InitializationState::command(char c)
-{
-}
-
-
-void InitializationState::exit()
-{
-}
\ No newline at end of file
+#endif
\ No newline at end of file
diff --git a/src/initialization_state.cpp b/src/initialization_state.cpp
index e69de29..9e2e8c0 100644
--- a/src/initialization_state.cpp
+++ b/src/initialization_state.cpp
@@ -0,0 +1,35 @@
+#include "initialization_state.h"
+#include "motor_controller.h"
+
+#include <Arduino.h>
+
+
+void InitializationState::enter()
+{
+    Serial.println();
+    Serial.println("State: Initialization");
+
+    digitalWrite(LED_BUILTIN, LOW);
+
+    context->stop_motor();
+
+    context->reset_speed_measurement();
+
+    Serial.println("Boot-up");
+}
+
+
+void InitializationState::update()
+{
+    context->to_operational();
+}
+
+
+void InitializationState::command(char c)
+{
+}
+
+
+void InitializationState::exit()
+{
+}
\ No newline at end of file