diff --git a/.gitignore b/.gitignore
index c427ec0..197fa4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ debug.*
 debug_log/
 .ropeproject/
 __pycache__/
+config/settings.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3790094..bcb2a80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.2.x
+### 0.2.0
+- **Cleaner folder structure**
+    - Moving files with classes to different folder to keep project cleaner.
+
 ## 0.1.x
 ### 0.1.1
 - **Add Original to add Timestamp to Images**
diff --git a/exif_options.yaml b/config/exif_options.yaml
similarity index 100%
rename from exif_options.yaml
rename to config/exif_options.yaml
diff --git a/main.py b/main.py
index 0dc60ae..058dd2b 100644
--- a/main.py
+++ b/main.py
@@ -1,14 +1,14 @@
 import os
 import re
 from datetime import datetime
-from utility import Utilities
-from image_handler import ImageProcessor, ExifHandler
-from tui import SimpleTUI
+from utils.utility import Utilities
+from utils.image_handler import ImageProcessor, ExifHandler
+from ui.tui import SimpleTUI
 
 class Optima35:
     # The layout of class Optima35 was originally made by ChatGPT, but major adjustments have been made. To remain transparent, I disclose this.
     def __init__(self, settings_file, exif_options_file):
-        self.version = "0.1.1"
+        self.version = "0.2.0"
         self.utilities = Utilities()
         self.image_processor = ImageProcessor()
         self.exif_handler = ExifHandler()
@@ -286,5 +286,5 @@ class Optima35:
         print("Done")
 
 if __name__ == "__main__":
-    app = Optima35("settings.yaml", "exif_options.yaml")
+    app = Optima35("config/settings.yaml", "config/exif_options.yaml")
     app.run()
diff --git a/ui/__init__.py b/ui/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tui.py b/ui/tui.py
similarity index 100%
rename from tui.py
rename to ui/tui.py
diff --git a/utils/__init__.py b/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/image_handler.py b/utils/image_handler.py
similarity index 100%
rename from image_handler.py
rename to utils/image_handler.py
diff --git a/utility.py b/utils/utility.py
similarity index 100%
rename from utility.py
rename to utils/utility.py