diff --git a/optima/__init__.py b/optima/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/optima35.py b/optima/optima35.py
similarity index 96%
rename from optima35.py
rename to optima/optima35.py
index 1b8b6c8..aa27255 100644
--- a/optima35.py
+++ b/optima/optima35.py
@@ -1,6 +1,7 @@
 import re
+import os
 from datetime import datetime
-#from utils.utility import Utilities
+# My packages
 from utils.image_handler import ImageProcessor, ExifHandler
 
 class OPTIMA35:
@@ -29,7 +30,7 @@ class OPTIMA35:
             "optimize": False,
             "gps": False
         }
-        self.selected_exif = None
+        self.selected_exif = {}
 
     def modify_timestamp_in_exif(self, exif_data, filename):
             """"Takes exif data and adjust time to fit ending of filename."""
@@ -50,6 +51,7 @@ class OPTIMA35:
     def process(self, image_input_file, image_output_file):
         with self.image_processor.open_image(image_input_file) as img:
             processed_img = img
+            image_name = os.path.basename(image_output_file)
 
             if self.settings["resize"] != False:
                 processed_img = self.image_processor.resize_image(
@@ -107,3 +109,7 @@ class OPTIMA35:
                 ending_number = current_image
             ending = f"{ending_number:0{total_digits}}"
             return f"{base_name}_{ending}"
+
+if __name__ == "__main__":
+    print("Please load OPTIMA35 into the ui class...")
+    exit()