diff --git a/src/data/hills.cpp b/src/data/hills.cpp
index fc8c969..6878445 100644
--- a/src/data/hills.cpp
+++ b/src/data/hills.cpp
@@ -1,13 +1,4 @@
 #include "hills.hpp"
-#include "kulle_0_png.hpp"
-#include "kulle_1_png.hpp"
-#include "kulle_2_png.hpp"
-#include "kulle_3_png.hpp"
-#include "kulle_4_png.hpp"
-#include "kulle_5_png.hpp"
-#include "kulle_6_png.hpp"
-#include "kulle_7_png.hpp"
-
 
 const HillData hills[] = {
         {kulle_0_png, kulle_0_png_length},
diff --git a/src/data/hills.hpp b/src/data/hills.hpp
index e744e7e..45a8800 100644
--- a/src/data/hills.hpp
+++ b/src/data/hills.hpp
@@ -1,9 +1,37 @@
 #pragma once
 
+#include <cstddef>
+
+extern const unsigned char kulle_0_png[];
+extern const size_t kulle_0_png_length;
+
+extern const unsigned char kulle_1_png[];
+extern const size_t kulle_1_png_length;
+
+extern const unsigned char kulle_2_png[];
+extern const size_t kulle_2_png_length;
+
+extern const unsigned char kulle_3_png[];
+extern const size_t kulle_3_png_length;
+
+extern const unsigned char kulle_4_png[];
+extern const size_t kulle_4_png_length;
+
+extern const unsigned char kulle_5_png[];
+extern const size_t kulle_5_png_length;
+
+extern const unsigned char kulle_6_png[];
+extern const size_t kulle_6_png_length;
+
+extern const unsigned char kulle_7_png[];
+extern const size_t kulle_7_png_length;
+
 
 struct HillData {
     unsigned const char *data;
     const size_t length;
 };
+
 extern const HillData hills[];
 extern const size_t hills_length;
+
diff --git a/src/data/kulle_0_png.cpp b/src/data/kulle_0_png.cpp
index f95c4db..d4ed415 100644
--- a/src/data/kulle_0_png.cpp
+++ b/src/data/kulle_0_png.cpp
@@ -1,4 +1,4 @@
-#include "kulle_0_png.hpp"
+#include "hills.hpp"
 
 const unsigned char kulle_0_png[] = {
     0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/src/data/kulle_0_png.hpp b/src/data/kulle_0_png.hpp
deleted file mode 100644
index 7055b02..0000000
--- a/src/data/kulle_0_png.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <cstddef>
-
-extern const unsigned char kulle_0_png[];
-extern const size_t kulle_0_png_length;
diff --git a/src/data/kulle_1_png.cpp b/src/data/kulle_1_png.cpp
index 532a052..82ab8ea 100644
--- a/src/data/kulle_1_png.cpp
+++ b/src/data/kulle_1_png.cpp
@@ -1,4 +1,4 @@
-#include "kulle_1_png.hpp"
+#include "hills.hpp"
 
 const unsigned char kulle_1_png[] = {
     0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/src/data/kulle_1_png.hpp b/src/data/kulle_1_png.hpp
deleted file mode 100644
index 0745df3..0000000
--- a/src/data/kulle_1_png.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <cstddef>
-
-extern const unsigned char kulle_1_png[];
-extern const size_t kulle_1_png_length;
diff --git a/src/data/kulle_2_png.cpp b/src/data/kulle_2_png.cpp
index da33916..f6f645b 100644
--- a/src/data/kulle_2_png.cpp
+++ b/src/data/kulle_2_png.cpp
@@ -1,4 +1,4 @@
-#include "kulle_2_png.hpp"
+#include "hills.hpp"
 
 const unsigned char kulle_2_png[] = {
         0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/src/data/kulle_2_png.hpp b/src/data/kulle_2_png.hpp
deleted file mode 100644
index 11e2401..0000000
--- a/src/data/kulle_2_png.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <cstddef>
-
-extern const unsigned char kulle_2_png[];
-extern const size_t kulle_2_png_length;
diff --git a/src/data/kulle_3_png.cpp b/src/data/kulle_3_png.cpp
index ee1c977..41a1658 100644
--- a/src/data/kulle_3_png.cpp
+++ b/src/data/kulle_3_png.cpp
@@ -1,5 +1,4 @@
-// This is the bytes of .\Kulle3.png
-#include "kulle_3_png.hpp"
+#include "hills.hpp"
 
 const unsigned char kulle_3_png[] = {
     0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/src/data/kulle_3_png.hpp b/src/data/kulle_3_png.hpp
deleted file mode 100644
index 2a9805a..0000000
--- a/src/data/kulle_3_png.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <cstddef>
-
-extern const unsigned char kulle_3_png[];
-extern const size_t kulle_3_png_length;
diff --git a/src/data/kulle_4_png.cpp b/src/data/kulle_4_png.cpp
index 240901c..1e0c4a8 100644
--- a/src/data/kulle_4_png.cpp
+++ b/src/data/kulle_4_png.cpp
@@ -1,4 +1,4 @@
-#include "kulle_4_png.hpp"
+#include "hills.hpp"
 
 const unsigned char kulle_4_png[] = {
     0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/src/data/kulle_4_png.hpp b/src/data/kulle_4_png.hpp
deleted file mode 100644
index 855096d..0000000
--- a/src/data/kulle_4_png.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <cstddef>
-
-extern const unsigned char kulle_4_png[];
-extern const size_t kulle_4_png_length;
diff --git a/src/data/kulle_5_png.cpp b/src/data/kulle_5_png.cpp
index dcaa36f..b83def0 100644
--- a/src/data/kulle_5_png.cpp
+++ b/src/data/kulle_5_png.cpp
@@ -1,4 +1,4 @@
-#include "kulle_5_png.hpp"
+#include "hills.hpp"
 
 const unsigned char kulle_5_png[] = {
     0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/src/data/kulle_5_png.hpp b/src/data/kulle_5_png.hpp
deleted file mode 100644
index 5975fdc..0000000
--- a/src/data/kulle_5_png.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <cstddef>
-
-extern const unsigned char kulle_5_png[];
-extern const size_t kulle_5_png_length;
diff --git a/src/data/kulle_6_png.cpp b/src/data/kulle_6_png.cpp
index e6f4a4c..f527dfc 100644
--- a/src/data/kulle_6_png.cpp
+++ b/src/data/kulle_6_png.cpp
@@ -1,4 +1,4 @@
-#include "kulle_6_png.hpp"
+#include "hills.hpp"
 
 const unsigned char kulle_6_png[] = {
     0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/src/data/kulle_6_png.hpp b/src/data/kulle_6_png.hpp
deleted file mode 100644
index b388039..0000000
--- a/src/data/kulle_6_png.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <cstddef>
-
-extern const unsigned char kulle_6_png[];
-extern const size_t kulle_6_png_length;
diff --git a/src/data/kulle_7_png.cpp b/src/data/kulle_7_png.cpp
index 9746cbe..b879d9d 100644
--- a/src/data/kulle_7_png.cpp
+++ b/src/data/kulle_7_png.cpp
@@ -1,4 +1,4 @@
-#include "kulle_7_png.hpp"
+#include "hills.hpp"
 
 const unsigned char kulle_7_png[] = {
     0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/src/data/kulle_7_png.hpp b/src/data/kulle_7_png.hpp
deleted file mode 100644
index 0276763..0000000
--- a/src/data/kulle_7_png.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <cstddef>
-
-extern const unsigned char kulle_7_png[];
-extern const size_t kulle_7_png_length;