diff --git a/DRAMSys/traceAnalyzer/CMakeLists.txt b/DRAMSys/traceAnalyzer/CMakeLists.txt
index 9a56cd93..e3bfe98f 100644
--- a/DRAMSys/traceAnalyzer/CMakeLists.txt
+++ b/DRAMSys/traceAnalyzer/CMakeLists.txt
@@ -112,11 +112,11 @@ add_executable(TraceAnalyzer
     simulationdialog.cpp
     businessObjects/dependencymodels.cpp
 
-    businessObjects/dramTimeDependencies/activatewindowpoolcontroller.cpp
-    businessObjects/dramTimeDependencies/dramtimedependenciesIF.cpp
     businessObjects/dramTimeDependencies/dbEntries/DDR3dbphaseentry.cpp
-    businessObjects/dramTimeDependencies/DDR3TimeDependencies.cpp
-    businessObjects/dramTimeDependencies/dramtimedependencyfactory.cpp
+    businessObjects/dramTimeDependencies/devices/activatewindowpoolcontroller.cpp
+    businessObjects/dramTimeDependencies/devices/dramtimedependenciesIF.cpp
+    businessObjects/dramTimeDependencies/devices/DDR3TimeDependencies.cpp
+    businessObjects/dramTimeDependencies/devices/dramtimedependencyfactory.cpp
     businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
 
     businessObjects/dramTimeDependencies/dramtimedependenciesIF.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/commonstructures.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/common.h
similarity index 96%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/commonstructures.h
rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/common.h
index 42365aa5..e0edd71d 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/commonstructures.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/common.h
@@ -46,7 +46,7 @@
 
 #include "businessObjects/phases/phasedependency.h"
 #include "timedependency.h"
-#include "businessObjects/dramTimeDependencies/dbEntries/includes.h"
+#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryTypes.h"
 
 struct PhaseTimeDependencies {
     explicit PhaseTimeDependencies(std::initializer_list<TimeDependency> d) : dependencies(d) {}
@@ -69,4 +69,4 @@ struct DBDependencyEntry {
     QString timeDependency;
     size_t dependencyPhaseID;
     QString dependencyPhaseName;
-};
+};
\ No newline at end of file
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/timedependency.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h
similarity index 91%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/timedependency.h
rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h
index f012353f..85de5e7b 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/timedependency.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h
@@ -3,8 +3,6 @@
 
 #include <QString>
 
-#include "businessObjects/phases/phasedependency.h"
-
 class TimeDependency {
 public:
     TimeDependency() = default;
@@ -19,5 +17,4 @@ public:
     QString timeDepName;
     bool considerIntraRank = false; // Used only for InterRank skip check in PhaseDependenciesTracker::mCalculateDependencies
 
-};
-
+};
\ No newline at end of file
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h
index 3711cd28..4b342b09 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h
@@ -4,7 +4,7 @@
 #include <QSqlQuery>
 
 #include "businessObjects/phases/phasedependency.h"
-#include "businessObjects/dramTimeDependencies/timedependency.h"
+#include "businessObjects/dramTimeDependencies/common/common.h"
 
 class DBPhaseEntryIF {
  public:
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/includes.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryTypes.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/includes.h
rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryTypes.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/DDR3TimeDependencies.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.cpp
rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/DDR3TimeDependencies.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/DDR3TimeDependencies.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.h
rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/DDR3TimeDependencies.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/activatewindowpoolcontroller.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/activatewindowpoolcontroller.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/activatewindowpoolcontroller.cpp
rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/activatewindowpoolcontroller.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/activatewindowpoolcontroller.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/activatewindowpoolcontroller.h
similarity index 97%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/activatewindowpoolcontroller.h
rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/activatewindowpoolcontroller.h
index 778f1af3..1c2aced7 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/activatewindowpoolcontroller.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/activatewindowpoolcontroller.h
@@ -35,7 +35,7 @@
 
 #pragma once
 
-#include "commonstructures.h"
+#include "businessObjects/dramTimeDependencies/common/common.h"
 
 class ActivateWindowPoolController {
 public:
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/dramtimedependenciesIF.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.cpp
rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/dramtimedependenciesIF.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/dramtimedependenciesIF.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.h
rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/dramtimedependenciesIF.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependencyfactory.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/dramtimedependencyfactory.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependencyfactory.cpp
rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/dramtimedependencyfactory.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependencyfactory.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/dramtimedependencyfactory.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependencyfactory.h
rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/devices/dramtimedependencyfactory.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
index 1ca19c6b..58f2a650 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
@@ -215,7 +215,7 @@ PhaseDependenciesTracker::mCalculateDependencies(const TraceDB& tdb, const std::
                 }
 
                 // Captures activate window dependencies
-                if (poolSubstrPos != -1) {                    
+                if (poolSubstrPos != -1) {       
                     if (otherPhase->phaseName == "ACT") {
                         QString poolName = dep.phaseDep.left(poolSubstrPos);
                         
@@ -255,6 +255,7 @@ PhaseDependenciesTracker::mCalculateDependencies(const TraceDB& tdb, const std::
 
             }
 
+            // Capture command bus dependencies
             if (timeDiff == device->getClk()) {
                 entries.emplace_back(DBDependencyEntry{
                     phase->id,
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h
index 074c5503..0a552abe 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h
@@ -40,8 +40,8 @@
 #include <QString>
 
 #include "data/tracedb.h"
-#include "dramtimedependencyfactory.h"
-#include "commonstructures.h"
+#include "devices/dramtimedependencyfactory.h"
+#include "common/common.h"
 
 class PhaseDependenciesTracker {
 public: