diff --git a/image_classifier/image_classifier.py b/image_classifier/image_classifier.py
index ec42404..af38c59 100755
--- a/image_classifier/image_classifier.py
+++ b/image_classifier/image_classifier.py
@@ -10,6 +10,7 @@ import os
 import logging
 import json
 import shutil
+import re
 import click
 import click_config_file
 from logging.handlers import SysLogHandler
@@ -93,9 +94,13 @@ class image_classifier:
                         new_path = os.path.join(dirname, original_date.strftime('%Y/%m/%d'), filename)
                         self._log.debug(f"New path: {new_path}")
                         os.makedirs(os.path.dirname(new_path), exist_ok=True)
+                    if not new_path:
+                        match = re.search(r'(?P<year>2[0-9]{3})[\-/\._]?(?P<month>[0-9]{1,2})[\-/\._]?(?P<day>[0-9]{1,2})')
+                        if match:
+                            new_path = os.path.join(dirname, match.group('year'), match.group('month'), match.group('day'), filename)
                     if new_path:
                         self._log.info(f"Moving file '{file}' to '{new_path}'...")
-                        shutil.move(file, new_path)
+                        #shutil.move(file, new_path)
                     else:
                         self._log.debug('No new path, so no moving.')
             else: