diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
index ab082fa..7e3a1d1 100644
--- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
+++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
@@ -1526,10 +1526,12 @@ public class delegationServices {
                                 String UUID = Lrequest.get("UUID").toString();
                                 String timeCurrent = LocalDateTime.now().toString(); //ISO-8601: yyyy-MM-ddTHH:mm:ss.S
                                 try {
-                                    File myObj = new File(homedir + "/ocs/telemetry/" + applicationName + UUID + timeCurrent + ".txt");
+                                    File myObj = new File(homedir + "/ocs/telemetry/" + UUID + "/" + applicationName + telemetryDetails + timeCurrent + ".txt");
+                                    File myFold = new File(homedir + "/ocs/telemetry/" + UUID);
+                                    myFold.mkdir();
                                     if (myObj.createNewFile()) {
                                         System.out.println("Log File created: " + myObj.getName());
-                                        FileWriter writer = new FileWriter(homedir + "/ocs/logs/" + applicationName + UUID + timeCurrent + ".txt", true);
+                                        FileWriter writer = new FileWriter(homedir + "/ocs/logs/" + UUID + "/" + applicationName + telemetryDetails + timeCurrent + ".txt", true);
                                         writer.write("This bug report is for: " + applicationName);
                                         writer.write("\r\n");
                                         writer.write("Type of telemetry: " + telemetryType);
@@ -1565,10 +1567,12 @@ public class delegationServices {
                                 String UUID = Lrequest.get("UUID").toString();
                                 String timeCurrent = LocalDateTime.now().toString(); //ISO-8601: yyyy-MM-ddTHH:mm:ss.S
                                 try {
-                                    File myObj = new File(homedir + "/ocs/logs/" + applicationName + UUID + timeCurrent + ".txt");
+                                    File myObj = new File(homedir + "/ocs/telemetry/" + UUID + "/" + applicationName + telemetryDetails + timeCurrent + ".txt");
+                                    File myFold = new File(homedir + "/ocs/telemetry/" + UUID);
+                                    myFold.mkdir();
                                     if (myObj.createNewFile()) {
                                         System.out.println("Log File created: " + myObj.getName());
-                                        FileWriter writer = new FileWriter(homedir + "/ocs/telemetry/" + applicationName + UUID + timeCurrent + ".txt", true);
+                                        FileWriter writer = new FileWriter(homedir + "/ocs/telemetry/" + UUID + "/" + applicationName + telemetryDetails + timeCurrent + ".txt", true);
                                         writer.write("This bug report is for: " + applicationName);
                                         writer.write("\r\n");
                                         writer.write("The telemetry type is: " + telemetryType);