diff --git a/.gitmodules b/.gitmodules
index 9248a7d2..7aed65f9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "DRAMSys/dramSys/src/common/third_party/DRAMPower"]
-	path = DRAMSys/dramSys/src/common/third_party/DRAMPower
+[submodule "DRAMSys/simulator/src/common/third_party/DRAMPower"]
+	path = DRAMSys/simulator/src/common/third_party/DRAMPower
 	url = https://github.com/ravenrd/DRAMPower.git
-[submodule "DRAMSys/dramSys/src/common/third_party/tinyxml2"]
-	path = DRAMSys/dramSys/src/common/third_party/tinyxml2
+[submodule "DRAMSys/simulator/src/common/third_party/tinyxml2"]
+	path = DRAMSys/simulator/src/common/third_party/tinyxml2
 	url = https://github.com/leethomason/tinyxml2.git
diff --git a/DRAMSys/dram.vp.system.pro b/DRAMSys/dram.vp.system.pro
index a1d542d7..3db74aa5 100644
--- a/DRAMSys/dram.vp.system.pro
+++ b/DRAMSys/dram.vp.system.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS = dramSys/dramSys.pro
+SUBDIRS = simulator/simulator.pro
 SUBDIRS += analyzer/traceAnalyzer.pro
 
diff --git a/DRAMSys/dramSys/src/common/third_party/DRAMPower b/DRAMSys/dramSys/src/common/third_party/DRAMPower
deleted file mode 160000
index e39b6d66..00000000
--- a/DRAMSys/dramSys/src/common/third_party/DRAMPower
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e39b6d6668fed4ddbc3c9150dce1dd1bfc7a8be2
diff --git a/DRAMSys/dramSys/src/common/third_party/tinyxml2 b/DRAMSys/dramSys/src/common/third_party/tinyxml2
deleted file mode 160000
index aebaeea6..00000000
--- a/DRAMSys/dramSys/src/common/third_party/tinyxml2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aebaeea687f69b41e55f1acbf0a11321c6af5bfd
diff --git a/DRAMSys/dramSys/resources/.gitignore b/DRAMSys/simulator/resources/.gitignore
similarity index 100%
rename from DRAMSys/dramSys/resources/.gitignore
rename to DRAMSys/simulator/resources/.gitignore
diff --git a/DRAMSys/dramSys/resources/configs/amconfigs/am_ddr4.xml b/DRAMSys/simulator/resources/configs/amconfigs/am_ddr4.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/amconfigs/am_ddr4.xml
rename to DRAMSys/simulator/resources/configs/amconfigs/am_ddr4.xml
diff --git a/DRAMSys/dramSys/resources/configs/amconfigs/am_highHits.xml b/DRAMSys/simulator/resources/configs/amconfigs/am_highHits.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/amconfigs/am_highHits.xml
rename to DRAMSys/simulator/resources/configs/amconfigs/am_highHits.xml
diff --git a/DRAMSys/dramSys/resources/configs/amconfigs/am_highPara.xml b/DRAMSys/simulator/resources/configs/amconfigs/am_highPara.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/amconfigs/am_highPara.xml
rename to DRAMSys/simulator/resources/configs/amconfigs/am_highPara.xml
diff --git a/DRAMSys/dramSys/resources/configs/amconfigs/am_lowHits.xml b/DRAMSys/simulator/resources/configs/amconfigs/am_lowHits.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/amconfigs/am_lowHits.xml
rename to DRAMSys/simulator/resources/configs/amconfigs/am_lowHits.xml
diff --git a/DRAMSys/dramSys/resources/configs/amconfigs/am_lowPara.xml b/DRAMSys/simulator/resources/configs/amconfigs/am_lowPara.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/amconfigs/am_lowPara.xml
rename to DRAMSys/simulator/resources/configs/amconfigs/am_lowPara.xml
diff --git a/DRAMSys/dramSys/resources/configs/amconfigs/am_wideio.xml b/DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/amconfigs/am_wideio.xml
rename to DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml
diff --git a/DRAMSys/dramSys/resources/configs/amconfigs/am_wideioFourBanks.xml b/DRAMSys/simulator/resources/configs/amconfigs/am_wideioFourBanks.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/amconfigs/am_wideioFourBanks.xml
rename to DRAMSys/simulator/resources/configs/amconfigs/am_wideioFourBanks.xml
diff --git a/DRAMSys/dramSys/resources/configs/memconfigs/.gitignore b/DRAMSys/simulator/resources/configs/memconfigs/.gitignore
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memconfigs/.gitignore
rename to DRAMSys/simulator/resources/configs/memconfigs/.gitignore
diff --git a/DRAMSys/dramSys/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml b/DRAMSys/simulator/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml
rename to DRAMSys/simulator/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml
diff --git a/DRAMSys/dramSys/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml b/DRAMSys/simulator/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml
rename to DRAMSys/simulator/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml
diff --git a/DRAMSys/dramSys/resources/configs/memconfigs/_old/grouper.xml b/DRAMSys/simulator/resources/configs/memconfigs/_old/grouper.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memconfigs/_old/grouper.xml
rename to DRAMSys/simulator/resources/configs/memconfigs/_old/grouper.xml
diff --git a/DRAMSys/dramSys/resources/configs/memconfigs/_old/par_bs.xml b/DRAMSys/simulator/resources/configs/memconfigs/_old/par_bs.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memconfigs/_old/par_bs.xml
rename to DRAMSys/simulator/resources/configs/memconfigs/_old/par_bs.xml
diff --git a/DRAMSys/dramSys/resources/configs/memconfigs/_old/par_bs_unaware.xml b/DRAMSys/simulator/resources/configs/memconfigs/_old/par_bs_unaware.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memconfigs/_old/par_bs_unaware.xml
rename to DRAMSys/simulator/resources/configs/memconfigs/_old/par_bs_unaware.xml
diff --git a/DRAMSys/dramSys/resources/configs/memconfigs/fifo.xml b/DRAMSys/simulator/resources/configs/memconfigs/fifo.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memconfigs/fifo.xml
rename to DRAMSys/simulator/resources/configs/memconfigs/fifo.xml
diff --git a/DRAMSys/dramSys/resources/configs/memconfigs/fifoStrict.xml b/DRAMSys/simulator/resources/configs/memconfigs/fifoStrict.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memconfigs/fifoStrict.xml
rename to DRAMSys/simulator/resources/configs/memconfigs/fifoStrict.xml
diff --git a/DRAMSys/dramSys/resources/configs/memconfigs/fr_fcfs.xml b/DRAMSys/simulator/resources/configs/memconfigs/fr_fcfs.xml
similarity index 71%
rename from DRAMSys/dramSys/resources/configs/memconfigs/fr_fcfs.xml
rename to DRAMSys/simulator/resources/configs/memconfigs/fr_fcfs.xml
index bf05420a..7f8af9a8 100644
--- a/DRAMSys/dramSys/resources/configs/memconfigs/fr_fcfs.xml
+++ b/DRAMSys/simulator/resources/configs/memconfigs/fr_fcfs.xml
@@ -8,8 +8,8 @@
   <PowerDownTimeout value="100" />
   <!-- Error Model: -->
   <ErrorChipSeed value="42" />
-  <ErrorCSVFile value="../../DRAMSys/dramSys/src/error/error.csv" />
-  <ErrorStoreMode value="ErrorModel" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
+  <ErrorCSVFile value="../../DRAMSys/simulator/src/error/error.csv" />
+  <ErrorStoreMode value="NoStorage" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
   <!-- 
   <Buswidth value="128" />
   <ReadWriteGrouping value="false" />
diff --git a/DRAMSys/dramSys/resources/configs/memspecs/DDR4.xml b/DRAMSys/simulator/resources/configs/memspecs/DDR4.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memspecs/DDR4.xml
rename to DRAMSys/simulator/resources/configs/memspecs/DDR4.xml
diff --git a/DRAMSys/dramSys/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml b/DRAMSys/simulator/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml
rename to DRAMSys/simulator/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml
diff --git a/DRAMSys/dramSys/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml b/DRAMSys/simulator/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml
rename to DRAMSys/simulator/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml
diff --git a/DRAMSys/dramSys/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml b/DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml
rename to DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml
diff --git a/DRAMSys/dramSys/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml b/DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml
rename to DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml
diff --git a/DRAMSys/dramSys/resources/configs/memspecs/MatzesWideIO-short.xml b/DRAMSys/simulator/resources/configs/memspecs/MatzesWideIO-short.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memspecs/MatzesWideIO-short.xml
rename to DRAMSys/simulator/resources/configs/memspecs/MatzesWideIO-short.xml
diff --git a/DRAMSys/dramSys/resources/configs/memspecs/MatzesWideIO.xml b/DRAMSys/simulator/resources/configs/memspecs/MatzesWideIO.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memspecs/MatzesWideIO.xml
rename to DRAMSys/simulator/resources/configs/memspecs/MatzesWideIO.xml
diff --git a/DRAMSys/dramSys/resources/configs/memspecs/WideIO.xml b/DRAMSys/simulator/resources/configs/memspecs/WideIO.xml
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memspecs/WideIO.xml
rename to DRAMSys/simulator/resources/configs/memspecs/WideIO.xml
diff --git a/DRAMSys/dramSys/resources/configs/memspecs/memspec.dtd b/DRAMSys/simulator/resources/configs/memspecs/memspec.dtd
similarity index 100%
rename from DRAMSys/dramSys/resources/configs/memspecs/memspec.dtd
rename to DRAMSys/simulator/resources/configs/memspecs/memspec.dtd
diff --git a/DRAMSys/dramSys/resources/scripts/address_scrambler.pl b/DRAMSys/simulator/resources/scripts/address_scrambler.pl
similarity index 100%
rename from DRAMSys/dramSys/resources/scripts/address_scrambler.pl
rename to DRAMSys/simulator/resources/scripts/address_scrambler.pl
diff --git a/DRAMSys/dramSys/resources/scripts/analyse_trace.pl b/DRAMSys/simulator/resources/scripts/analyse_trace.pl
similarity index 100%
rename from DRAMSys/dramSys/resources/scripts/analyse_trace.pl
rename to DRAMSys/simulator/resources/scripts/analyse_trace.pl
diff --git a/DRAMSys/dramSys/resources/scripts/createTraceDB.sql b/DRAMSys/simulator/resources/scripts/createTraceDB.sql
similarity index 100%
rename from DRAMSys/dramSys/resources/scripts/createTraceDB.sql
rename to DRAMSys/simulator/resources/scripts/createTraceDB.sql
diff --git a/DRAMSys/dramSys/resources/scripts/stride_detection.pl b/DRAMSys/simulator/resources/scripts/stride_detection.pl
similarity index 100%
rename from DRAMSys/dramSys/resources/scripts/stride_detection.pl
rename to DRAMSys/simulator/resources/scripts/stride_detection.pl
diff --git a/DRAMSys/dramSys/resources/simulations/sim-batch.xml b/DRAMSys/simulator/resources/simulations/sim-batch.xml
similarity index 63%
rename from DRAMSys/dramSys/resources/simulations/sim-batch.xml
rename to DRAMSys/simulator/resources/simulations/sim-batch.xml
index 3f2170e5..ab1ecb3c 100644
--- a/DRAMSys/dramSys/resources/simulations/sim-batch.xml
+++ b/DRAMSys/simulator/resources/simulations/sim-batch.xml
@@ -8,15 +8,15 @@
     </simconfig>
 
     <memspecs>
-        <memspec src="../../DRAMSys/dramSys/resources/configs/memspecs/WideIO.xml"></memspec>
+        <memspec src="../../DRAMSys/simulator/resources/configs/memspecs/WideIO.xml"></memspec>
     </memspecs>
 
     <addressmappings>
-        <addressmapping src="../../DRAMSys/dramSys/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
+        <addressmapping src="../../DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
     </addressmappings>
 
     <memconfigs>
-        <memconfig src="../../DRAMSys/dramSys/resources/configs/memconfigs/fr_fcfs.xml"/>
+        <memconfig src="../../DRAMSys/simulator/resources/configs/memconfigs/fr_fcfs.xml"/>
     </memconfigs>
 
     <tracesetups>
diff --git a/DRAMSys/dramSys/resources/traces/prettyTest b/DRAMSys/simulator/resources/traces/prettyTest
similarity index 100%
rename from DRAMSys/dramSys/resources/traces/prettyTest
rename to DRAMSys/simulator/resources/traces/prettyTest
diff --git a/DRAMSys/dramSys/dramSys.pro b/DRAMSys/simulator/simulator.pro
similarity index 96%
rename from DRAMSys/dramSys/dramSys.pro
rename to DRAMSys/simulator/simulator.pro
index 22c0e37a..483de244 100644
--- a/DRAMSys/dramSys/dramSys.pro
+++ b/DRAMSys/simulator/simulator.pro
@@ -1,15 +1,17 @@
+TARGET = dramSys
+
 TEMPLATE = app
 CONFIG += console
 CONFIG -= app_bundle
 CONFIG -= qt
 
-system(cd ../../DRAMSys/dramSys/src/common/third_party/DRAMPower; make lib;)
+system(cd ../../DRAMSys/simulator/src/common/third_party/DRAMPower; make lib;)
 
 LIBS += -L/opt/systemc/lib-linux64 -lsystemc
 LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system
 LIBS += -lsqlite3
 LIBS += -lpthread
-LIBS += -L../../DRAMSys/dramSys/src/common/third_party/DRAMPower/src/ -ldrampower
+LIBS += -L../../DRAMSys/simulator/src/common/third_party/DRAMPower/src/ -ldrampower
 
 INCLUDEPATH += /opt/systemc/include
 INCLUDEPATH += /opt/boost/include
diff --git a/DRAMSys/dramSys/src/common/DebugManager.cpp b/DRAMSys/simulator/src/common/DebugManager.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/common/DebugManager.cpp
rename to DRAMSys/simulator/src/common/DebugManager.cpp
diff --git a/DRAMSys/dramSys/src/common/DebugManager.h b/DRAMSys/simulator/src/common/DebugManager.h
similarity index 100%
rename from DRAMSys/dramSys/src/common/DebugManager.h
rename to DRAMSys/simulator/src/common/DebugManager.h
diff --git a/DRAMSys/dramSys/src/common/TlmRecorder.cpp b/DRAMSys/simulator/src/common/TlmRecorder.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/common/TlmRecorder.cpp
rename to DRAMSys/simulator/src/common/TlmRecorder.cpp
diff --git a/DRAMSys/dramSys/src/common/TlmRecorder.h b/DRAMSys/simulator/src/common/TlmRecorder.h
similarity index 99%
rename from DRAMSys/dramSys/src/common/TlmRecorder.h
rename to DRAMSys/simulator/src/common/TlmRecorder.h
index c20c90e6..f302042c 100644
--- a/DRAMSys/dramSys/src/common/TlmRecorder.h
+++ b/DRAMSys/simulator/src/common/TlmRecorder.h
@@ -130,7 +130,7 @@ private:
     sc_time simulationTimeCoveredByRecording;
 
     std::vector<tlm::tlm_phase> transactionTerminatingPhases;
-    sqlite3 *db;
+    sqlite3 *db = NULL;
     sqlite3_stmt *insertTransactionStatement, *insertRangeStatement, *updateRangeStatement,
             *insertPhaseStatement, *updatePhaseStatement, *insertGeneralInfoStatement, *insertDebugMessageStatement, *updateDataStrobeStatement;
     std::string insertTransactionString, insertRangeString, updateRangeString, insertPhaseString, updatePhaseString, insertGeneralInfoString,
diff --git a/DRAMSys/dramSys/src/common/Utils.cpp b/DRAMSys/simulator/src/common/Utils.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/common/Utils.cpp
rename to DRAMSys/simulator/src/common/Utils.cpp
diff --git a/DRAMSys/dramSys/src/common/Utils.h b/DRAMSys/simulator/src/common/Utils.h
similarity index 100%
rename from DRAMSys/dramSys/src/common/Utils.h
rename to DRAMSys/simulator/src/common/Utils.h
diff --git a/DRAMSys/dramSys/src/common/dramExtension.cpp b/DRAMSys/simulator/src/common/dramExtension.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/common/dramExtension.cpp
rename to DRAMSys/simulator/src/common/dramExtension.cpp
diff --git a/DRAMSys/dramSys/src/common/dramExtension.h b/DRAMSys/simulator/src/common/dramExtension.h
similarity index 100%
rename from DRAMSys/dramSys/src/common/dramExtension.h
rename to DRAMSys/simulator/src/common/dramExtension.h
diff --git a/DRAMSys/dramSys/src/common/protocol.h b/DRAMSys/simulator/src/common/protocol.h
similarity index 100%
rename from DRAMSys/dramSys/src/common/protocol.h
rename to DRAMSys/simulator/src/common/protocol.h
diff --git a/DRAMSys/simulator/src/common/third_party/DRAMPower b/DRAMSys/simulator/src/common/third_party/DRAMPower
new file mode 160000
index 00000000..0827d36c
--- /dev/null
+++ b/DRAMSys/simulator/src/common/third_party/DRAMPower
@@ -0,0 +1 @@
+Subproject commit 0827d36c58bd1558674e73fa8fed943492ff7d9e
diff --git a/DRAMSys/simulator/src/common/third_party/tinyxml2 b/DRAMSys/simulator/src/common/third_party/tinyxml2
new file mode 160000
index 00000000..78fca3db
--- /dev/null
+++ b/DRAMSys/simulator/src/common/third_party/tinyxml2
@@ -0,0 +1 @@
+Subproject commit 78fca3db835a5e2de1f3e90f5c6362dda750e3ac
diff --git a/DRAMSys/dramSys/src/common/tlm2_base_protocol_checker.h b/DRAMSys/simulator/src/common/tlm2_base_protocol_checker.h
similarity index 100%
rename from DRAMSys/dramSys/src/common/tlm2_base_protocol_checker.h
rename to DRAMSys/simulator/src/common/tlm2_base_protocol_checker.h
diff --git a/DRAMSys/dramSys/src/common/xmlAddressdecoder.cpp b/DRAMSys/simulator/src/common/xmlAddressdecoder.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/common/xmlAddressdecoder.cpp
rename to DRAMSys/simulator/src/common/xmlAddressdecoder.cpp
diff --git a/DRAMSys/dramSys/src/common/xmlAddressdecoder.h b/DRAMSys/simulator/src/common/xmlAddressdecoder.h
similarity index 100%
rename from DRAMSys/dramSys/src/common/xmlAddressdecoder.h
rename to DRAMSys/simulator/src/common/xmlAddressdecoder.h
diff --git a/DRAMSys/dramSys/src/controller/Command.cpp b/DRAMSys/simulator/src/controller/Command.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/Command.cpp
rename to DRAMSys/simulator/src/controller/Command.cpp
diff --git a/DRAMSys/dramSys/src/controller/Command.h b/DRAMSys/simulator/src/controller/Command.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/Command.h
rename to DRAMSys/simulator/src/controller/Command.h
diff --git a/DRAMSys/dramSys/src/controller/Controller.cpp b/DRAMSys/simulator/src/controller/Controller.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/Controller.cpp
rename to DRAMSys/simulator/src/controller/Controller.cpp
diff --git a/DRAMSys/dramSys/src/controller/Controller.h b/DRAMSys/simulator/src/controller/Controller.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/Controller.h
rename to DRAMSys/simulator/src/controller/Controller.h
diff --git a/DRAMSys/dramSys/src/controller/ControllerState.cpp b/DRAMSys/simulator/src/controller/ControllerState.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/ControllerState.cpp
rename to DRAMSys/simulator/src/controller/ControllerState.cpp
diff --git a/DRAMSys/dramSys/src/controller/ControllerState.h b/DRAMSys/simulator/src/controller/ControllerState.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/ControllerState.h
rename to DRAMSys/simulator/src/controller/ControllerState.h
diff --git a/DRAMSys/dramSys/src/controller/IController.h b/DRAMSys/simulator/src/controller/IController.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/IController.h
rename to DRAMSys/simulator/src/controller/IController.h
diff --git a/DRAMSys/dramSys/src/controller/RowBufferStates.cpp b/DRAMSys/simulator/src/controller/RowBufferStates.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/RowBufferStates.cpp
rename to DRAMSys/simulator/src/controller/RowBufferStates.cpp
diff --git a/DRAMSys/dramSys/src/controller/RowBufferStates.h b/DRAMSys/simulator/src/controller/RowBufferStates.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/RowBufferStates.h
rename to DRAMSys/simulator/src/controller/RowBufferStates.h
diff --git a/DRAMSys/dramSys/src/controller/core/ControllerCore.cpp b/DRAMSys/simulator/src/controller/core/ControllerCore.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/ControllerCore.cpp
rename to DRAMSys/simulator/src/controller/core/ControllerCore.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/ControllerCore.h b/DRAMSys/simulator/src/controller/core/ControllerCore.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/ControllerCore.h
rename to DRAMSys/simulator/src/controller/core/ControllerCore.h
diff --git a/DRAMSys/dramSys/src/controller/core/Slots.cpp b/DRAMSys/simulator/src/controller/core/Slots.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/Slots.cpp
rename to DRAMSys/simulator/src/controller/core/Slots.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/Slots.h b/DRAMSys/simulator/src/controller/core/Slots.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/Slots.h
rename to DRAMSys/simulator/src/controller/core/Slots.h
diff --git a/DRAMSys/dramSys/src/controller/core/TimingCalculation.cpp b/DRAMSys/simulator/src/controller/core/TimingCalculation.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/TimingCalculation.cpp
rename to DRAMSys/simulator/src/controller/core/TimingCalculation.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/TimingCalculation.h b/DRAMSys/simulator/src/controller/core/TimingCalculation.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/TimingCalculation.h
rename to DRAMSys/simulator/src/controller/core/TimingCalculation.h
diff --git a/DRAMSys/dramSys/src/controller/core/configuration/Configuration.cpp b/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/configuration/Configuration.cpp
rename to DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/configuration/Configuration.h b/DRAMSys/simulator/src/controller/core/configuration/Configuration.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/configuration/Configuration.h
rename to DRAMSys/simulator/src/controller/core/configuration/Configuration.h
diff --git a/DRAMSys/dramSys/src/controller/core/configuration/ConfigurationLoader.cpp b/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/configuration/ConfigurationLoader.cpp
rename to DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/configuration/ConfigurationLoader.h b/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/configuration/ConfigurationLoader.h
rename to DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.h
diff --git a/DRAMSys/dramSys/src/controller/core/configuration/MemSpec.h b/DRAMSys/simulator/src/controller/core/configuration/MemSpec.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/configuration/MemSpec.h
rename to DRAMSys/simulator/src/controller/core/configuration/MemSpec.h
diff --git a/DRAMSys/dramSys/src/controller/core/configuration/MemSpecLoader.h.autosave b/DRAMSys/simulator/src/controller/core/configuration/MemSpecLoader.h.autosave
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/configuration/MemSpecLoader.h.autosave
rename to DRAMSys/simulator/src/controller/core/configuration/MemSpecLoader.h.autosave
diff --git a/DRAMSys/dramSys/src/controller/core/powerdown/IPowerDownManager.h b/DRAMSys/simulator/src/controller/core/powerdown/IPowerDownManager.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/powerdown/IPowerDownManager.h
rename to DRAMSys/simulator/src/controller/core/powerdown/IPowerDownManager.h
diff --git a/DRAMSys/dramSys/src/controller/core/powerdown/NoPowerDown.cpp b/DRAMSys/simulator/src/controller/core/powerdown/NoPowerDown.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/powerdown/NoPowerDown.cpp
rename to DRAMSys/simulator/src/controller/core/powerdown/NoPowerDown.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/powerdown/NoPowerDown.h b/DRAMSys/simulator/src/controller/core/powerdown/NoPowerDown.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/powerdown/NoPowerDown.h
rename to DRAMSys/simulator/src/controller/core/powerdown/NoPowerDown.h
diff --git a/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManager.cpp b/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManager.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManager.cpp
rename to DRAMSys/simulator/src/controller/core/powerdown/PowerDownManager.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManager.h b/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManager.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManager.h
rename to DRAMSys/simulator/src/controller/core/powerdown/PowerDownManager.h
diff --git a/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerBankwise.cpp b/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerBankwise.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerBankwise.cpp
rename to DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerBankwise.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerBankwise.h b/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerBankwise.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerBankwise.h
rename to DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerBankwise.h
diff --git a/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerTimeout.cpp b/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeout.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerTimeout.cpp
rename to DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeout.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerTimeout.h b/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeout.h
similarity index 97%
rename from DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerTimeout.h
rename to DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeout.h
index 1b077fcc..e0b9ab0f 100644
--- a/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerTimeout.h
+++ b/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeout.h
@@ -66,7 +66,7 @@ private:
     std::map<Bank, tlm::tlm_generic_payload> powerDownPayloads;
     void sendPowerDownPayloads(ScheduledCommand& cmd);
 
-    PowerDownState powerDownState;
+    PowerDownState powerDownState = PowerDownState::Awake;
     void setPowerDownState(PowerDownState state);
     bool isInPowerDown();
 };
diff --git a/DRAMSys/dramSys/src/controller/core/refresh/IRefreshManager.h b/DRAMSys/simulator/src/controller/core/refresh/IRefreshManager.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/refresh/IRefreshManager.h
rename to DRAMSys/simulator/src/controller/core/refresh/IRefreshManager.h
diff --git a/DRAMSys/dramSys/src/controller/core/refresh/RefreshManager.cpp b/DRAMSys/simulator/src/controller/core/refresh/RefreshManager.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/refresh/RefreshManager.cpp
rename to DRAMSys/simulator/src/controller/core/refresh/RefreshManager.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/refresh/RefreshManager.h b/DRAMSys/simulator/src/controller/core/refresh/RefreshManager.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/refresh/RefreshManager.h
rename to DRAMSys/simulator/src/controller/core/refresh/RefreshManager.h
diff --git a/DRAMSys/dramSys/src/controller/core/refresh/RefreshManagerBankwise.cpp b/DRAMSys/simulator/src/controller/core/refresh/RefreshManagerBankwise.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/refresh/RefreshManagerBankwise.cpp
rename to DRAMSys/simulator/src/controller/core/refresh/RefreshManagerBankwise.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/refresh/RefreshManagerBankwise.h b/DRAMSys/simulator/src/controller/core/refresh/RefreshManagerBankwise.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/refresh/RefreshManagerBankwise.h
rename to DRAMSys/simulator/src/controller/core/refresh/RefreshManagerBankwise.h
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/ScheduledCommand.cpp b/DRAMSys/simulator/src/controller/core/scheduling/ScheduledCommand.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/ScheduledCommand.cpp
rename to DRAMSys/simulator/src/controller/core/scheduling/ScheduledCommand.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/ScheduledCommand.h b/DRAMSys/simulator/src/controller/core/scheduling/ScheduledCommand.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/ScheduledCommand.h
rename to DRAMSys/simulator/src/controller/core/scheduling/ScheduledCommand.h
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/Trigger.h b/DRAMSys/simulator/src/controller/core/scheduling/Trigger.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/Trigger.h
rename to DRAMSys/simulator/src/controller/core/scheduling/Trigger.h
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/ActivateChecker.cpp b/DRAMSys/simulator/src/controller/core/scheduling/checker/ActivateChecker.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/ActivateChecker.cpp
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/ActivateChecker.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/ActivateChecker.h b/DRAMSys/simulator/src/controller/core/scheduling/checker/ActivateChecker.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/ActivateChecker.h
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/ActivateChecker.h
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/ICommandChecker.h b/DRAMSys/simulator/src/controller/core/scheduling/checker/ICommandChecker.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/ICommandChecker.h
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/ICommandChecker.h
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/PowerDownChecker.cpp b/DRAMSys/simulator/src/controller/core/scheduling/checker/PowerDownChecker.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/PowerDownChecker.cpp
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/PowerDownChecker.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/PowerDownChecker.h b/DRAMSys/simulator/src/controller/core/scheduling/checker/PowerDownChecker.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/PowerDownChecker.h
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/PowerDownChecker.h
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp b/DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeAllChecker.h b/DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeAllChecker.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeAllChecker.h
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeAllChecker.h
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeChecker.cpp b/DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeChecker.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeChecker.cpp
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeChecker.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeChecker.h b/DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeChecker.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeChecker.h
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeChecker.h
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/ReadChecker.cpp b/DRAMSys/simulator/src/controller/core/scheduling/checker/ReadChecker.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/ReadChecker.cpp
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/ReadChecker.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/ReadChecker.h b/DRAMSys/simulator/src/controller/core/scheduling/checker/ReadChecker.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/ReadChecker.h
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/ReadChecker.h
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/RefreshChecker.cpp b/DRAMSys/simulator/src/controller/core/scheduling/checker/RefreshChecker.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/RefreshChecker.cpp
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/RefreshChecker.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/RefreshChecker.h b/DRAMSys/simulator/src/controller/core/scheduling/checker/RefreshChecker.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/RefreshChecker.h
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/RefreshChecker.h
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/WriteChecker.cpp b/DRAMSys/simulator/src/controller/core/scheduling/checker/WriteChecker.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/WriteChecker.cpp
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/WriteChecker.cpp
diff --git a/DRAMSys/dramSys/src/controller/core/scheduling/checker/WriteChecker.h b/DRAMSys/simulator/src/controller/core/scheduling/checker/WriteChecker.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/core/scheduling/checker/WriteChecker.h
rename to DRAMSys/simulator/src/controller/core/scheduling/checker/WriteChecker.h
diff --git a/DRAMSys/dramSys/src/controller/scheduler/Fifo.cpp b/DRAMSys/simulator/src/controller/scheduler/Fifo.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/Fifo.cpp
rename to DRAMSys/simulator/src/controller/scheduler/Fifo.cpp
diff --git a/DRAMSys/dramSys/src/controller/scheduler/Fifo.h b/DRAMSys/simulator/src/controller/scheduler/Fifo.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/Fifo.h
rename to DRAMSys/simulator/src/controller/scheduler/Fifo.h
diff --git a/DRAMSys/dramSys/src/controller/scheduler/FifoStrict.cpp b/DRAMSys/simulator/src/controller/scheduler/FifoStrict.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/FifoStrict.cpp
rename to DRAMSys/simulator/src/controller/scheduler/FifoStrict.cpp
diff --git a/DRAMSys/dramSys/src/controller/scheduler/FifoStrict.h b/DRAMSys/simulator/src/controller/scheduler/FifoStrict.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/FifoStrict.h
rename to DRAMSys/simulator/src/controller/scheduler/FifoStrict.h
diff --git a/DRAMSys/dramSys/src/controller/scheduler/Fr_Fcfs.cpp b/DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/Fr_Fcfs.cpp
rename to DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs.cpp
diff --git a/DRAMSys/dramSys/src/controller/scheduler/Fr_Fcfs.h b/DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/Fr_Fcfs.h
rename to DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs.h
diff --git a/DRAMSys/dramSys/src/controller/scheduler/IScheduler.cpp b/DRAMSys/simulator/src/controller/scheduler/IScheduler.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/IScheduler.cpp
rename to DRAMSys/simulator/src/controller/scheduler/IScheduler.cpp
diff --git a/DRAMSys/dramSys/src/controller/scheduler/IScheduler.h b/DRAMSys/simulator/src/controller/scheduler/IScheduler.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/IScheduler.h
rename to DRAMSys/simulator/src/controller/scheduler/IScheduler.h
diff --git a/DRAMSys/dramSys/src/controller/scheduler/PARBS.cpp b/DRAMSys/simulator/src/controller/scheduler/PARBS.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/PARBS.cpp
rename to DRAMSys/simulator/src/controller/scheduler/PARBS.cpp
diff --git a/DRAMSys/dramSys/src/controller/scheduler/PARBS.h b/DRAMSys/simulator/src/controller/scheduler/PARBS.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/PARBS.h
rename to DRAMSys/simulator/src/controller/scheduler/PARBS.h
diff --git a/DRAMSys/dramSys/src/controller/scheduler/ThreadLoad.cpp b/DRAMSys/simulator/src/controller/scheduler/ThreadLoad.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/ThreadLoad.cpp
rename to DRAMSys/simulator/src/controller/scheduler/ThreadLoad.cpp
diff --git a/DRAMSys/dramSys/src/controller/scheduler/ThreadLoad.h b/DRAMSys/simulator/src/controller/scheduler/ThreadLoad.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/ThreadLoad.h
rename to DRAMSys/simulator/src/controller/scheduler/ThreadLoad.h
diff --git a/DRAMSys/dramSys/src/controller/scheduler/readwritegrouper.cpp b/DRAMSys/simulator/src/controller/scheduler/readwritegrouper.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/readwritegrouper.cpp
rename to DRAMSys/simulator/src/controller/scheduler/readwritegrouper.cpp
diff --git a/DRAMSys/dramSys/src/controller/scheduler/readwritegrouper.h b/DRAMSys/simulator/src/controller/scheduler/readwritegrouper.h
similarity index 100%
rename from DRAMSys/dramSys/src/controller/scheduler/readwritegrouper.h
rename to DRAMSys/simulator/src/controller/scheduler/readwritegrouper.h
diff --git a/DRAMSys/dramSys/src/error/error.csv b/DRAMSys/simulator/src/error/error.csv
similarity index 100%
rename from DRAMSys/dramSys/src/error/error.csv
rename to DRAMSys/simulator/src/error/error.csv
diff --git a/DRAMSys/dramSys/src/error/errormodel.cpp b/DRAMSys/simulator/src/error/errormodel.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/error/errormodel.cpp
rename to DRAMSys/simulator/src/error/errormodel.cpp
diff --git a/DRAMSys/dramSys/src/error/errormodel.h b/DRAMSys/simulator/src/error/errormodel.h
similarity index 100%
rename from DRAMSys/dramSys/src/error/errormodel.h
rename to DRAMSys/simulator/src/error/errormodel.h
diff --git a/DRAMSys/dramSys/src/simulation/Arbiter.h b/DRAMSys/simulator/src/simulation/Arbiter.h
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/Arbiter.h
rename to DRAMSys/simulator/src/simulation/Arbiter.h
diff --git a/DRAMSys/dramSys/src/simulation/Dram.h b/DRAMSys/simulator/src/simulation/Dram.h
similarity index 99%
rename from DRAMSys/dramSys/src/simulation/Dram.h
rename to DRAMSys/simulator/src/simulation/Dram.h
index 9f013e00..127613f2 100644
--- a/DRAMSys/dramSys/src/simulation/Dram.h
+++ b/DRAMSys/simulator/src/simulation/Dram.h
@@ -182,7 +182,6 @@ struct Dram : sc_module
             cout << name() << string("\tTotal Energy: \t") + to_string(DRAMPower->getEnergy().total_energy) << endl;
             cout << name() << string("\tAverage Power: \t") + to_string(DRAMPower->getPower().average_power) << endl;
         }
-
         // Clean up:
         delete [] ememory;
         //std::cout << "Simulated Memory Size: " << memory.size() << endl; // TODO Aufrauemen
diff --git a/DRAMSys/dramSys/src/simulation/MemoryManager.cpp b/DRAMSys/simulator/src/simulation/MemoryManager.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/MemoryManager.cpp
rename to DRAMSys/simulator/src/simulation/MemoryManager.cpp
diff --git a/DRAMSys/dramSys/src/simulation/MemoryManager.h b/DRAMSys/simulator/src/simulation/MemoryManager.h
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/MemoryManager.h
rename to DRAMSys/simulator/src/simulation/MemoryManager.h
diff --git a/DRAMSys/dramSys/src/simulation/ReorderBuffer.h b/DRAMSys/simulator/src/simulation/ReorderBuffer.h
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/ReorderBuffer.h
rename to DRAMSys/simulator/src/simulation/ReorderBuffer.h
diff --git a/DRAMSys/dramSys/src/simulation/Simulation.cpp b/DRAMSys/simulator/src/simulation/Simulation.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/Simulation.cpp
rename to DRAMSys/simulator/src/simulation/Simulation.cpp
diff --git a/DRAMSys/dramSys/src/simulation/Simulation.h b/DRAMSys/simulator/src/simulation/Simulation.h
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/Simulation.h
rename to DRAMSys/simulator/src/simulation/Simulation.h
diff --git a/DRAMSys/dramSys/src/simulation/SimulationManager.cpp b/DRAMSys/simulator/src/simulation/SimulationManager.cpp
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/SimulationManager.cpp
rename to DRAMSys/simulator/src/simulation/SimulationManager.cpp
diff --git a/DRAMSys/dramSys/src/simulation/SimulationManager.h b/DRAMSys/simulator/src/simulation/SimulationManager.h
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/SimulationManager.h
rename to DRAMSys/simulator/src/simulation/SimulationManager.h
diff --git a/DRAMSys/dramSys/src/simulation/StlDataPlayer.h b/DRAMSys/simulator/src/simulation/StlDataPlayer.h
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/StlDataPlayer.h
rename to DRAMSys/simulator/src/simulation/StlDataPlayer.h
diff --git a/DRAMSys/dramSys/src/simulation/StlPlayer.h b/DRAMSys/simulator/src/simulation/StlPlayer.h
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/StlPlayer.h
rename to DRAMSys/simulator/src/simulation/StlPlayer.h
diff --git a/DRAMSys/dramSys/src/simulation/TraceGenerator.h b/DRAMSys/simulator/src/simulation/TraceGenerator.h
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/TraceGenerator.h
rename to DRAMSys/simulator/src/simulation/TraceGenerator.h
diff --git a/DRAMSys/dramSys/src/simulation/TracePlayer.h b/DRAMSys/simulator/src/simulation/TracePlayer.h
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/TracePlayer.h
rename to DRAMSys/simulator/src/simulation/TracePlayer.h
diff --git a/DRAMSys/dramSys/src/simulation/TracePlayerListener.h b/DRAMSys/simulator/src/simulation/TracePlayerListener.h
similarity index 100%
rename from DRAMSys/dramSys/src/simulation/TracePlayerListener.h
rename to DRAMSys/simulator/src/simulation/TracePlayerListener.h
diff --git a/DRAMSys/dramSys/src/simulation/main.cpp b/DRAMSys/simulator/src/simulation/main.cpp
similarity index 91%
rename from DRAMSys/dramSys/src/simulation/main.cpp
rename to DRAMSys/simulator/src/simulation/main.cpp
index 86038a7b..9fc14cf1 100644
--- a/DRAMSys/dramSys/src/simulation/main.cpp
+++ b/DRAMSys/simulator/src/simulation/main.cpp
@@ -59,14 +59,15 @@ int main(int argc, char **argv)
 int sc_main(int argc, char **argv)
 {
     sc_set_time_resolution(1, SC_PS);
-    resources = pathOfFile(argv[0]) + string("/../../DRAMSys/dramSys/resources/");
+    resources = pathOfFile(argv[0]) + string("/../../DRAMSys/simulator/resources/");
 
-    cout<<resources<<endl;
+    cout << "Resources directory is " << resources << endl;
     string simulationToRun;
     if(argc > 1)
         simulationToRun = argv[1];
     else
         simulationToRun = resources + "simulations/sim-batch.xml";
+    cout << "Simulation file is " << simulationToRun << endl;
 
     SimulationManager manager(resources);
     manager.loadSimulationsFromXML(simulationToRun);
diff --git a/DRAMSys/tests/error/fr_fcfs.xml b/DRAMSys/tests/error/fr_fcfs.xml
index bf05420a..d0f996f0 100644
--- a/DRAMSys/tests/error/fr_fcfs.xml
+++ b/DRAMSys/tests/error/fr_fcfs.xml
@@ -8,7 +8,7 @@
   <PowerDownTimeout value="100" />
   <!-- Error Model: -->
   <ErrorChipSeed value="42" />
-  <ErrorCSVFile value="../../DRAMSys/dramSys/src/error/error.csv" />
+  <ErrorCSVFile value="../../DRAMSys/simulator/src/error/error.csv" />
   <ErrorStoreMode value="ErrorModel" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
   <!-- 
   <Buswidth value="128" />
diff --git a/DRAMSys/tests/error/sim-batch.xml b/DRAMSys/tests/error/sim-batch.xml
index c1a5c478..b4129576 100644
--- a/DRAMSys/tests/error/sim-batch.xml
+++ b/DRAMSys/tests/error/sim-batch.xml
@@ -8,15 +8,15 @@
     </simconfig>
 
     <memspecs>
-        <memspec src="../../DRAMSys/dramSys/resources/configs/memspecs/WideIO.xml"></memspec>
+        <memspec src="../../DRAMSys/simulator/resources/configs/memspecs/WideIO.xml"></memspec>
     </memspecs>
 
     <addressmappings>
-        <addressmapping src="../../DRAMSys/dramSys/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
+        <addressmapping src="../../DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
     </addressmappings>
 
     <memconfigs>
-        <memconfig src="../../DRAMSys/dramSys/resources/configs/memconfigs/fr_fcfs.xml"/>
+        <memconfig src="../../DRAMSys/simulator/resources/configs/memconfigs/fr_fcfs.xml"/>
     </memconfigs>
 
     <tracesetups>
diff --git a/README.md b/README.md
index 05bd734f..45180796 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ The compilation generates executable binary files **dramSys** and
 From the build directory use the commands below to execute DRAMSys.
 
 ``` bash
-$ cd dramSys
+$ cd simulator
 $ ./dramSys
 ```
 
@@ -134,17 +134,17 @@ The XML code below shows a typic configuration:
 
     <!-- Memory Specifications -->
     <memspecs>
-        <memspec src="../../DRAMSys/dramSys/resources/configs/memspecs/WideIO.xml"></memspec>
+        <memspec src="../../DRAMSys/simulator/resources/configs/memspecs/WideIO.xml"></memspec>
     </memspecs>
 
     <!-- Address Mappings -->
     <addressmappings>
-        <addressmapping src="../../DRAMSys/dramSys/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
+        <addressmapping src="../../DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
     </addressmappings>
 
     <!-- Memory Configurations -->
     <memconfigs>
-        <memconfig src="../../DRAMSys/dramSys/resources/configs/memconfigs/fifo.xml"/>
+        <memconfig src="../../DRAMSys/simulator/resources/configs/memconfigs/fifo.xml"/>
     </memconfigs>
     
     <!-- Trace Setups -->
@@ -236,7 +236,7 @@ Below are listed the configuration sections and configuration fields.
 
   XML files describe the address mapping to be used in the simulation.
 
-  The file [am_wideio.xml](DRAMSys/dramSys/resources/configs/amconfigs/am_wideio.xml) is
+  The file [am_wideio.xml](DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml) is
   a good example.
 
   ``` xml
@@ -265,7 +265,7 @@ Below are listed the configuration sections and configuration fields.
 
 - **Memory Configuration**
 
-  The content of [fifo.xml](DRAMSys/dramSys/resources/configs/memconfigs/fifo.xml) is
+  The content of [fifo.xml](DRAMSys/simulator/resources/configs/memconfigs/fifo.xml) is
   presented below as an example.
 
   ``` xml
@@ -341,7 +341,7 @@ Resources of the simulator are available inside of the **resources** directory
 and its sub-directories.
 
 ``` bash
-$ cd DRAMSys/dramSys/resources
+$ cd DRAMSys/simulator/resources
 ```
 
 A description of the content each directory follows.