diff --git a/src/ScreenCountdown.cpp b/src/Screen/ScreenCountdown.cpp
similarity index 100%
rename from src/ScreenCountdown.cpp
rename to src/Screen/ScreenCountdown.cpp
diff --git a/src/ScreenCountdown.h b/src/Screen/ScreenCountdown.h
similarity index 100%
rename from src/ScreenCountdown.h
rename to src/Screen/ScreenCountdown.h
diff --git a/src/ScreenMenu.cpp b/src/Screen/ScreenMenu.cpp
similarity index 100%
rename from src/ScreenMenu.cpp
rename to src/Screen/ScreenMenu.cpp
diff --git a/src/ScreenMenu.h b/src/Screen/ScreenMenu.h
similarity index 100%
rename from src/ScreenMenu.h
rename to src/Screen/ScreenMenu.h
diff --git a/src/ScreenSetTime.cpp b/src/Screen/ScreenSetTime.cpp
similarity index 92%
rename from src/ScreenSetTime.cpp
rename to src/Screen/ScreenSetTime.cpp
index e0c3d3c..1f0f3ed 100644
--- a/src/ScreenSetTime.cpp
+++ b/src/Screen/ScreenSetTime.cpp
@@ -1,5 +1,5 @@
 #include "ScreenSetTime.h"
-#include "ScreenMenu.h"
+#include "Screen/ScreenMenu.h"
 #include "ExposureTimer.h"
 #include "Buzzer.h"
 #include "Config.h"
@@ -8,12 +8,12 @@
 void ScreenSetTime::printExposureTime()
 {
   getDisplay()->setCursor(0, 1);
-  printTime(ExposureTime);  
+  printTime(ExposureTime);
 }
 
 
 void ScreenSetTime::onShow()
-{ 
+{
   getDisplay()->setCursor(0, 0);
   getDisplay()->print("Exposure time:  ");
 
@@ -36,7 +36,7 @@ void ScreenSetTime::onButton()
 void ScreenSetTime::onEncoder(long lastPosition, long newPosition)
 {
   buzzSelect();
-  
+
   if (newPosition > lastPosition)
     ExposureTime += ExposureTime >= LargeStepTreshold ? LargeStep : SmallStep;
   else if (ExposureTime > 0)
diff --git a/src/ScreenSetTime.h b/src/Screen/ScreenSetTime.h
similarity index 100%
rename from src/ScreenSetTime.h
rename to src/Screen/ScreenSetTime.h
diff --git a/src/main.cpp b/src/main.cpp
index 526ccab..2a04dff 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,7 +4,7 @@
 #include <LiquidCrystal.h>
 #include "Config.h"
 #include "ScreenManager.h"
-#include "ScreenSetTime.h"
+#include "Screen/ScreenSetTime.h"
 #include "Buzzer.h"
 #include "ExposureTimer.h"