diff --git a/back/frontImages/models.py b/back/frontImages/models.py
index 88533d1..ec517a1 100644
--- a/back/frontImages/models.py
+++ b/back/frontImages/models.py
@@ -1,7 +1,17 @@
 from django.db import models
 
+import logging
+
+logger = logging.getLogger("root")
+
+def group_based_upload_to(instance, filename):
+    logger.info(instance)
+    return "files/image/{}/{}/{}".format(
+        type(instance).__name__.lower(), instance.id, filename
+    )
+    
 class Image(models.Model):
-    file = models.ImageField(upload_to='images/')
+    file = models.ImageField(upload_to=group_based_upload_to)
     alt = models.CharField(max_length=255)
     title = models.CharField(max_length=255)
 
@@ -10,7 +20,7 @@ class Image(models.Model):
     
 
 class Element3D(models.Model):
-    model_file = models.FileField(upload_to='models/')
+    model_file = models.FileField(upload_to=group_based_upload_to)
     name = models.CharField(max_length=255)
     description = models.TextField()