diff --git a/DRAM/.cproject b/DRAM/.cproject
index 9bfc63fc..0aea2ac1 100644
--- a/DRAM/.cproject
+++ b/DRAM/.cproject
@@ -29,7 +29,7 @@
 								<option id="gnu.cpp.compiler.option.include.paths.1915081878" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="/home/gernhard/gmock-1.7.0/include"/>
 									<listOptionValue builtIn="false" value="/home/gernhard/systemc-2.3.0/include"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/dram}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc}/../common/common/standalone/include&quot;"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.other.2019766237" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -std=c++11" valueType="string"/>
@@ -63,6 +63,11 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
+					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="DRAM"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="testing"/>
+					</sourceEntries>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
@@ -72,8 +77,11 @@
 				<externalSettings>
 					<externalSetting>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/DRAM"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/dram"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/DRAM/platformArchitect"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/dram/platformArchitect"/>
 						<entry flags="RESOLVED" kind="libraryFile" name="DRAM" srcPrefixMapping="" srcRootPath=""/>
+						<entry flags="RESOLVED" kind="libraryFile" name="dram" srcPrefixMapping="" srcRootPath=""/>
 					</externalSetting>
 				</externalSettings>
 				<extensions>
@@ -85,7 +93,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="Build to be included in the PA" id="cdt.managedbuild.config.gnu.exe.debug.1370040858.1136170534" name="platformArchitect" parent="cdt.managedbuild.config.gnu.exe.debug" postbuildStep="cd ..;find dram -name &quot;*.h&quot;|cpio -pdvm ${PWD}/include">
+				<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="Build to be included in the PA" id="cdt.managedbuild.config.gnu.exe.debug.1370040858.1136170534" name="platformArchitect" parent="cdt.managedbuild.config.gnu.exe.debug" postbuildStep="cd ..;find src -name &quot;*.h&quot;|cpio -pdvm ${PWD}/include;cd ${PWD}/include;rm -rf dram;mv src dram">
 					<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1370040858.1136170534." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1023307960" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.414978133" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
@@ -98,7 +106,7 @@
 								<option id="gnu.cpp.compiler.option.include.paths.1209861138" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="/opt/synopsys/H-2013.06-SP2/SLS/linux/common/include"/>
 									<listOptionValue builtIn="false" value="/opt/synopsys/H-2013.06-SP2/SLS/linux/common/include/tlm"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/dram}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc}/../common/common/platformArchitect/include&quot;"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.other.747930109" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0" valueType="string"/>
@@ -174,4 +182,16 @@
 			<path value=""/>
 		</doc-comment-owner>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+		<buildTargets>
+			<target name="standalone" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments/>
+				<buildTarget>standalone</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+		</buildTargets>
+	</storageModule>
 </cproject>
diff --git a/DRAM/.gitignore b/DRAM/.gitignore
index 9de9ebd0..d8639600 100644
--- a/DRAM/.gitignore
+++ b/DRAM/.gitignore
@@ -1,3 +1,5 @@
 /Debug
 /platformArchitect
 /standalone
+/standalone
+/platformArchitect
diff --git a/DRAM/.project b/DRAM/.project
index 19711e8f..0ebeb50d 100644
--- a/DRAM/.project
+++ b/DRAM/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>DRAM</name>
+	<name>dram</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/DRAM/dram/core/scheduling/Command.h b/DRAM/src/core/Command.h
similarity index 93%
rename from DRAM/dram/core/scheduling/Command.h
rename to DRAM/src/core/Command.h
index d2b9436a..f9b2407d 100644
--- a/DRAM/dram/core/scheduling/Command.h
+++ b/DRAM/src/core/Command.h
@@ -8,7 +8,7 @@
 #ifndef COMMAND_H_
 #define COMMAND_H_
 
-namespace controller {
+namespace core {
 
 enum Command {NOP, Precharge, PrechargeAll, Activate, Read, Write, ReadA, WriteA, Refresh};
 
diff --git a/DRAM/dram/core/scheduling/CommandBus.cpp b/DRAM/src/core/CommandBus.cpp
similarity index 95%
rename from DRAM/dram/core/scheduling/CommandBus.cpp
rename to DRAM/src/core/CommandBus.cpp
index f4ad233d..9db270d5 100644
--- a/DRAM/dram/core/scheduling/CommandBus.cpp
+++ b/DRAM/src/core/CommandBus.cpp
@@ -8,7 +8,7 @@
 #include "CommandBus.h"
 #include <algorithm>
 
-namespace controller {
+namespace core {
 
 void CommandBus::schedule(const CommandSchedule& schedule)
 {
@@ -26,15 +26,16 @@ void CommandBus::scheduleCommand(const ScheduledCommand& command)
 
 	changeControllerState(command);
 	pendingBusCommands.insert(command.getStart());
-	lastCommandsOnBus[command.getCommand()][command.getBank()] = command;
 
-	//notify tlm wrapper
+	wrapper.sendCommand(command.getStart(),command.getTransaction(),command.getCommand());
+	lastCommandsOnBus[command.getCommand()][command.getBank()] = command;
 	lastCommandsOnBus[command.getCommand()][command.getBank()].invalidateTransaction();
+
 }
 
 void CommandBus::scheduleTrigger(const Trigger command, sc_time time)
 {
-	//notify tlm wrapper
+	wrapper.sendTrigger(time,command);
 }
 
 ScheduledCommand& CommandBus::getLastCommand(Command command, Bank bank)
diff --git a/DRAM/dram/core/scheduling/CommandBus.h b/DRAM/src/core/CommandBus.h
similarity index 60%
rename from DRAM/dram/core/scheduling/CommandBus.h
rename to DRAM/src/core/CommandBus.h
index 4c55ffbf..e70a4b0d 100644
--- a/DRAM/dram/core/scheduling/CommandBus.h
+++ b/DRAM/src/core/CommandBus.h
@@ -8,41 +8,51 @@
 #ifndef INTERNALSCHEDULER_H_
 #define INTERNALSCHEDULER_H_
 
-#include "CommandSchedule.h"
+#include "scheduling/CommandSchedule.h"
 #include "core/ControllerState.h"
 #include "core/scheduling/Trigger.h"
 #include "IInternalScheduler.h"
 #include "core/Configuration.h"
 #include "core/scheduling/checker/ICommandChecker.h"
+#include "tlm/IControllerWrapper.h"
 #include <map>
 #include <set>
 
-namespace controller{
+namespace core {
 
-class CommandBus : public IInternalScheduler
+class CommandBus: public IInternalScheduler
 {
 public:
-	CommandBus(const Configuration& config, controller::ControllerState& state,std::vector<ICommandChecker*>& checker) : config(config), state(state), checker(checker) {}
-	virtual void schedule(const CommandSchedule& schedule);//TODO add to interface
+	CommandBus(const Configuration& config, core::ControllerState& state,
+			std::vector<ICommandChecker*>& checker, IControllerWrapper& wrapper):
+				wrapper(wrapper), config(config), state(state), checker(checker)
+	{
+	}
+	virtual void schedule(const CommandSchedule& schedule); //TODO add to interface
 	virtual void scheduleCommand(const ScheduledCommand& command);
 	virtual void scheduleTrigger(const Trigger trigger, sc_time time);
 
+
 	void cleanUpBus(sc_time currentTime);
 
-	ScheduledCommand& getLastCommand(Command command, Bank bank);//TODO simple way to make it const?
+	ScheduledCommand& getLastCommand(Command command, Bank bank); //TODO simple way to make it const?
 	ScheduledCommand& getLastCommand(Command command);
 	bool notYetScheduled(Command command) const;
 	bool notYetScheduled(Command command, Bank bank) const;
 	sc_time getEarliestStartTime(const ScheduledCommand& command) const;
 
-	const std::set<sc_time>& getPendingBusCommands() const {return pendingBusCommands;}
+	const std::set<sc_time>& getPendingBusCommands() const
+	{
+		return pendingBusCommands;
+	}
 
 private:
+	IControllerWrapper& wrapper;
 	const Configuration& config;
-	controller::ControllerState& state;
+	core::ControllerState& state;
 	std::vector<ICommandChecker*>& checker;
 
-	std::map<Command,std::map<Bank, ScheduledCommand> > lastCommandsOnBus;
+	std::map<Command, std::map<Bank, ScheduledCommand> > lastCommandsOnBus;
 	std::set<sc_time> pendingBusCommands;
 
 	void changeControllerState(const ScheduledCommand& command);
diff --git a/DRAM/dram/core/Configuration.h b/DRAM/src/core/Configuration.h
similarity index 95%
rename from DRAM/dram/core/Configuration.h
rename to DRAM/src/core/Configuration.h
index 37631c23..df838d22 100644
--- a/DRAM/dram/core/Configuration.h
+++ b/DRAM/src/core/Configuration.h
@@ -11,7 +11,7 @@
 #include <systemc.h>
 #include "TimingConfiguration.h"
 
-namespace controller{
+namespace core{
 
 struct Configuration
 {
diff --git a/DRAM/dram/core/Controller.cpp b/DRAM/src/core/Controller.cpp
similarity index 78%
rename from DRAM/dram/core/Controller.cpp
rename to DRAM/src/core/Controller.cpp
index 2b1a2fa9..39a28d3f 100644
--- a/DRAM/dram/core/Controller.cpp
+++ b/DRAM/src/core/Controller.cpp
@@ -12,12 +12,12 @@
 #include "core/scheduling/checker/ReadChecker.h"
 #include "core/scheduling/checker/WriteChecker.h"
 
-namespace controller {
+namespace core {
 
-Controller::Controller() :
+DramController::DramController(IControllerWrapper& wrapper) :
 		config(), state(config.numberOfBanks), commandSequenceGenerator(state), commandChecker(), commandSequenceScheduler(
-				*this), refreshManager(config.Timings.refreshTimings[0], bus), bus(config, state,
-				allCommandChecker)
+				commandChecker), refreshManager(config.Timings.refreshTimings[0], bus), bus(config, state,
+				allCommandChecker, wrapper)
 {
 	addCommandChecker(Activate, new ActivateChecker(config, bus));
 	addCommandChecker(Precharge, new PrechargeChecker(config, bus));
@@ -25,13 +25,13 @@ Controller::Controller() :
 	addCommandChecker(Write, new WriteChecker(config, bus));
 }
 
-void Controller::addCommandChecker(Command command, ICommandChecker* checker)
+void DramController::addCommandChecker(Command command, ICommandChecker* checker)
 {
 	commandChecker[command] = checker;
 	allCommandChecker.push_back(checker);
 }
 
-Controller::~Controller()
+DramController::~DramController()
 {
 	std::map<Command, ICommandChecker*>::iterator it = commandChecker.begin();
 	while (it != commandChecker.end())
@@ -41,7 +41,7 @@ Controller::~Controller()
 	commandChecker.clear();
 }
 
-bool Controller::schedule(sc_time currentTime, tlm::tlm_generic_payload& externalTransaction)
+void DramController::schedule(sc_time currentTime, tlm::tlm_generic_payload& externalTransaction)
 {
 	bus.cleanUpBus(currentTime);
 
@@ -57,11 +57,9 @@ bool Controller::schedule(sc_time currentTime, tlm::tlm_generic_payload& externa
 	}
 
 	bus.schedule(schedule);
-
-	return true;
 }
 
-const ICommandChecker& Controller::getChecker(Command command) const
+const ICommandChecker& DramController::getChecker(Command command) const
 {
 	std::map<Command, ICommandChecker*>::const_iterator result = commandChecker.find(command);
 	assert(result != commandChecker.end());
diff --git a/DRAM/dram/core/Controller.h b/DRAM/src/core/Controller.h
similarity index 78%
rename from DRAM/dram/core/Controller.h
rename to DRAM/src/core/Controller.h
index dcf442a4..8b07ba82 100644
--- a/DRAM/dram/core/Controller.h
+++ b/DRAM/src/core/Controller.h
@@ -10,34 +10,35 @@
 
 #include <tlm.h>
 #include "scheduling/CommandSequenceGenerator.h"
-#include "scheduling/CommandBus.h"
+#include "CommandBus.h"
 #include "Configuration.h"
 #include "refresh/RefreshManager.h"
 #include "powerdown/PowerDownManager.h"
 #include <map>
 #include "scheduling/checker/ICommandChecker.h"
 #include "scheduling/CommandSequenceScheduler.h"
+#include "tlm/IControllerWrapper.h"
 
-namespace controller {
+namespace core {
 
-class Controller
+class DramController
 {
 public:
-	Controller();
-	virtual ~Controller();
+	DramController(IControllerWrapper& wrapper);
+	virtual ~DramController();
 
-	bool schedule(sc_time currentTime, tlm::tlm_generic_payload& externalTransaction); //TODO return TLM status??
+	void schedule(sc_time currentTime, tlm::tlm_generic_payload& externalTransaction);
 	const ICommandChecker& getChecker(Command command) const;
 
-private:
 	Configuration config;
-	ControllerState state;
+	RefreshManager refreshManager;
 
+private:
+	ControllerState state;
 	CommandSequenceGenerator commandSequenceGenerator;
 	std::map<Command, ICommandChecker*> commandChecker;
 	std::vector<ICommandChecker*> allCommandChecker;
 	CommandSequenceScheduler commandSequenceScheduler;
-	RefreshManager refreshManager;
 	//PowerDownManager powerDownManager;
 	CommandBus bus;
 
diff --git a/DRAM/dram/core/ControllerState.cpp b/DRAM/src/core/ControllerState.cpp
similarity index 93%
rename from DRAM/dram/core/ControllerState.cpp
rename to DRAM/src/core/ControllerState.cpp
index 5598ee52..ab8d35da 100644
--- a/DRAM/dram/core/ControllerState.cpp
+++ b/DRAM/src/core/ControllerState.cpp
@@ -7,7 +7,7 @@
 
 #include "ControllerState.h"
 
-namespace controller {
+namespace core {
 
 ControllerState::ControllerState(unsigned int numberOfBanks) : bankStates(numberOfBanks)
 {
diff --git a/DRAM/dram/core/ControllerState.h b/DRAM/src/core/ControllerState.h
similarity index 94%
rename from DRAM/dram/core/ControllerState.h
rename to DRAM/src/core/ControllerState.h
index ce728d12..5055fd45 100644
--- a/DRAM/dram/core/ControllerState.h
+++ b/DRAM/src/core/ControllerState.h
@@ -10,7 +10,7 @@
 
 #include "common/BankStates.h"
 
-namespace controller {
+namespace core {
 
 class ControllerState {
 public:
diff --git a/DRAM/dram/core/scheduling/IInternalScheduler.h b/DRAM/src/core/IInternalScheduler.h
similarity index 57%
rename from DRAM/dram/core/scheduling/IInternalScheduler.h
rename to DRAM/src/core/IInternalScheduler.h
index b21e13fe..228fc7ef 100644
--- a/DRAM/dram/core/scheduling/IInternalScheduler.h
+++ b/DRAM/src/core/IInternalScheduler.h
@@ -7,15 +7,16 @@
 
 #ifndef IINTERNALSCHEDULER_H_
 #define IINTERNALSCHEDULER_H_
+#include <systemc.h>
 
-namespace controller
+namespace core
 {
 class IInternalScheduler
 {
 public:
 	virtual ~IInternalScheduler() {}
-	virtual void scheduleCommand(const controller::ScheduledCommand& command) = 0;
-	virtual void scheduleTrigger(const controller::Trigger trigger, sc_time time) = 0;
+	virtual void scheduleCommand(const core::ScheduledCommand& command) = 0;
+	virtual void scheduleTrigger(const core::Trigger trigger, sc_time time) = 0;
 };
 }
 
diff --git a/DRAM/dram/core/TimingConfiguration.h b/DRAM/src/core/TimingConfiguration.h
similarity index 98%
rename from DRAM/dram/core/TimingConfiguration.h
rename to DRAM/src/core/TimingConfiguration.h
index 9273526b..465f736f 100644
--- a/DRAM/dram/core/TimingConfiguration.h
+++ b/DRAM/src/core/TimingConfiguration.h
@@ -11,7 +11,7 @@
 #include <systemc.h>
 #include "core/utils/Utils.h"
 
-namespace controller{
+namespace core{
 
 struct RefreshTiming
 {
diff --git a/DRAM/dram/core/powerdown/PowerDownManager.cpp b/DRAM/src/core/powerdown/PowerDownManager.cpp
similarity index 93%
rename from DRAM/dram/core/powerdown/PowerDownManager.cpp
rename to DRAM/src/core/powerdown/PowerDownManager.cpp
index 3636afbd..1ee7f3e3 100644
--- a/DRAM/dram/core/powerdown/PowerDownManager.cpp
+++ b/DRAM/src/core/powerdown/PowerDownManager.cpp
@@ -7,7 +7,7 @@
 
 #include <core/powerdown/PowerDownManager.h>
 
-namespace controller {
+namespace core {
 
 PowerDownManager::PowerDownManager()
 {
diff --git a/DRAM/dram/core/powerdown/PowerDownManager.h b/DRAM/src/core/powerdown/PowerDownManager.h
similarity index 92%
rename from DRAM/dram/core/powerdown/PowerDownManager.h
rename to DRAM/src/core/powerdown/PowerDownManager.h
index 968ebb68..7c597ac4 100644
--- a/DRAM/dram/core/powerdown/PowerDownManager.h
+++ b/DRAM/src/core/powerdown/PowerDownManager.h
@@ -8,7 +8,7 @@
 #ifndef POWERDOWNMANAGER_H_
 #define POWERDOWNMANAGER_H_
 
-namespace controller {
+namespace core {
 
 class PowerDownManager
 {
diff --git a/DRAM/dram/core/refresh/BankwiseRefreshManager.cpp b/DRAM/src/core/refresh/BankwiseRefreshManager.cpp
similarity index 98%
rename from DRAM/dram/core/refresh/BankwiseRefreshManager.cpp
rename to DRAM/src/core/refresh/BankwiseRefreshManager.cpp
index bff3c405..2cbe7ee2 100644
--- a/DRAM/dram/core/refresh/BankwiseRefreshManager.cpp
+++ b/DRAM/src/core/refresh/BankwiseRefreshManager.cpp
@@ -9,7 +9,7 @@
 
 using namespace std;
 
-namespace controller {
+namespace core {
 
 BankwiseRefreshManager::BankwiseRefreshManager(vector<RefreshTiming> refreshTimings,
 		IInternalScheduler& internalScheduler)
diff --git a/DRAM/dram/core/refresh/BankwiseRefreshManager.h b/DRAM/src/core/refresh/BankwiseRefreshManager.h
similarity index 96%
rename from DRAM/dram/core/refresh/BankwiseRefreshManager.h
rename to DRAM/src/core/refresh/BankwiseRefreshManager.h
index 59b7e084..e3c6a560 100644
--- a/DRAM/dram/core/refresh/BankwiseRefreshManager.h
+++ b/DRAM/src/core/refresh/BankwiseRefreshManager.h
@@ -12,7 +12,7 @@
 #include "common/dramExtension.h"
 #include "RefreshManager.h"
 
-namespace controller {
+namespace core {
 
 class BankwiseRefreshManager : public IRefreshManager
 {
diff --git a/DRAM/dram/core/refresh/IRefreshManager.h b/DRAM/src/core/refresh/IRefreshManager.h
similarity index 88%
rename from DRAM/dram/core/refresh/IRefreshManager.h
rename to DRAM/src/core/refresh/IRefreshManager.h
index 6d8b0e0a..f54e4b7c 100644
--- a/DRAM/dram/core/refresh/IRefreshManager.h
+++ b/DRAM/src/core/refresh/IRefreshManager.h
@@ -10,11 +10,11 @@
 
 #include <systemc.h>
 #include <vector>
-#include "core/scheduling/CommandBus.h"
+#include "core/CommandBus.h"
 #include "core/Configuration.h"
 #include "core/scheduling/ScheduledCommand.h"
 
-namespace controller {
+namespace core {
 
 class IRefreshManager
 {
diff --git a/DRAM/dram/core/refresh/RefreshManager.cpp b/DRAM/src/core/refresh/RefreshManager.cpp
similarity index 99%
rename from DRAM/dram/core/refresh/RefreshManager.cpp
rename to DRAM/src/core/refresh/RefreshManager.cpp
index 37fc4cc1..026c23ae 100644
--- a/DRAM/dram/core/refresh/RefreshManager.cpp
+++ b/DRAM/src/core/refresh/RefreshManager.cpp
@@ -10,7 +10,7 @@
 
 
 
-namespace controller {
+namespace core {
 
 RefreshManager::RefreshManager(const RefreshTiming& refreshTiming,
 		IInternalScheduler& internalScheduler) :
diff --git a/DRAM/dram/core/refresh/RefreshManager.h b/DRAM/src/core/refresh/RefreshManager.h
similarity index 97%
rename from DRAM/dram/core/refresh/RefreshManager.h
rename to DRAM/src/core/refresh/RefreshManager.h
index 054e1995..739704d7 100644
--- a/DRAM/dram/core/refresh/RefreshManager.h
+++ b/DRAM/src/core/refresh/RefreshManager.h
@@ -11,7 +11,7 @@
 #include "IRefreshManager.h"
 #include "common/dramExtension.h"
 
-namespace controller {
+namespace core {
 
 class RefreshManager : public IRefreshManager
 {
diff --git a/DRAM/dram/core/scheduling/CommandSchedule.h b/DRAM/src/core/scheduling/CommandSchedule.h
similarity index 98%
rename from DRAM/dram/core/scheduling/CommandSchedule.h
rename to DRAM/src/core/scheduling/CommandSchedule.h
index a7e79a02..091188ea 100644
--- a/DRAM/dram/core/scheduling/CommandSchedule.h
+++ b/DRAM/src/core/scheduling/CommandSchedule.h
@@ -12,7 +12,7 @@
 #include "common/dramExtension.h"
 #include "ScheduledCommand.h"
 
-namespace controller {
+namespace core {
 
 class CommandSchedule
 {
diff --git a/DRAM/dram/core/scheduling/CommandSequenceGenerator.cpp b/DRAM/src/core/scheduling/CommandSequenceGenerator.cpp
similarity index 98%
rename from DRAM/dram/core/scheduling/CommandSequenceGenerator.cpp
rename to DRAM/src/core/scheduling/CommandSequenceGenerator.cpp
index 54e93b13..b8508306 100644
--- a/DRAM/dram/core/scheduling/CommandSequenceGenerator.cpp
+++ b/DRAM/src/core/scheduling/CommandSequenceGenerator.cpp
@@ -10,7 +10,7 @@
 
 using namespace std;
 
-namespace controller {
+namespace core {
 
 CommandSequence CommandSequenceGenerator::generateCommandSequence(tlm::tlm_generic_payload& transaction)
 {
diff --git a/DRAM/dram/core/scheduling/CommandSequenceGenerator.h b/DRAM/src/core/scheduling/CommandSequenceGenerator.h
similarity index 95%
rename from DRAM/dram/core/scheduling/CommandSequenceGenerator.h
rename to DRAM/src/core/scheduling/CommandSequenceGenerator.h
index 51b69fbb..9be1c0cd 100644
--- a/DRAM/dram/core/scheduling/CommandSequenceGenerator.h
+++ b/DRAM/src/core/scheduling/CommandSequenceGenerator.h
@@ -11,9 +11,9 @@
 #include <tlm.h>
 #include <vector>
 #include "core/ControllerState.h"
-#include "Command.h"
+#include "core/Command.h"
 
-namespace controller {
+namespace core {
 
 class CommandSequenceGenerator {
 public:
diff --git a/DRAM/dram/core/scheduling/CommandSequenceScheduler.cpp b/DRAM/src/core/scheduling/CommandSequenceScheduler.cpp
similarity index 89%
rename from DRAM/dram/core/scheduling/CommandSequenceScheduler.cpp
rename to DRAM/src/core/scheduling/CommandSequenceScheduler.cpp
index b875232e..9f612999 100644
--- a/DRAM/dram/core/scheduling/CommandSequenceScheduler.cpp
+++ b/DRAM/src/core/scheduling/CommandSequenceScheduler.cpp
@@ -8,7 +8,7 @@
 #include "core/scheduling/CommandSequenceScheduler.h"
 #include "core/Controller.h"
 
-namespace controller {
+namespace core {
 
 CommandSchedule CommandSequenceScheduler::prepareSchedule(sc_time start,
 		tlm::tlm_generic_payload& transaction, CommandSequence commands)
@@ -17,7 +17,7 @@ CommandSchedule CommandSequenceScheduler::prepareSchedule(sc_time start,
 	for (unsigned int i = 0; i < commands.size(); ++i)
 	{
 		Command command = commands.at(i);
-		const ICommandChecker& checker = controller.getChecker(command);
+		ICommandChecker& checker = *commandChecker[command];
 
 		if (i > 0)
 			start = schedule.getEnd();
diff --git a/DRAM/dram/core/scheduling/CommandSequenceScheduler.h b/DRAM/src/core/scheduling/CommandSequenceScheduler.h
similarity index 70%
rename from DRAM/dram/core/scheduling/CommandSequenceScheduler.h
rename to DRAM/src/core/scheduling/CommandSequenceScheduler.h
index e4431abf..e9c9a5a1 100644
--- a/DRAM/dram/core/scheduling/CommandSequenceScheduler.h
+++ b/DRAM/src/core/scheduling/CommandSequenceScheduler.h
@@ -9,25 +9,25 @@
 #define COMMANDSEQUENCESCHEDULER_H_
 
 #include "CommandSchedule.h"
-#include "Command.h"
+#include "core/Command.h"
 #include <map>
 #include "core/scheduling/checker/ICommandChecker.h"
 
 
 
-namespace controller {
+namespace core {
 
-class Controller;
+class DramController;
 
 class CommandSequenceScheduler
 {
 public:
-	CommandSequenceScheduler(const Controller& controller) : controller(controller){}
+	CommandSequenceScheduler(std::map<Command, ICommandChecker*>& commandChecker) : commandChecker(commandChecker){}
 	virtual ~CommandSequenceScheduler(){}
 	CommandSchedule prepareSchedule(sc_time start, tlm::tlm_generic_payload& transaction, CommandSequence commands);
 
 private:
-	const Controller& controller;
+	std::map<Command, ICommandChecker*>& commandChecker;
 };
 
 } /* namespace controller */
diff --git a/DRAM/dram/core/scheduling/ScheduledCommand.h b/DRAM/src/core/scheduling/ScheduledCommand.h
similarity index 97%
rename from DRAM/dram/core/scheduling/ScheduledCommand.h
rename to DRAM/src/core/scheduling/ScheduledCommand.h
index 59719f1d..d6c6a86a 100644
--- a/DRAM/dram/core/scheduling/ScheduledCommand.h
+++ b/DRAM/src/core/scheduling/ScheduledCommand.h
@@ -10,10 +10,10 @@
 
 #include <systemc.h>
 #include <tlm.h>
-#include "Command.h"
+#include "core/Command.h"
 #include "common/dramExtension.h"
 
-namespace controller {
+namespace core {
 
 class ScheduledCommand
 {
diff --git a/DRAM/dram/core/scheduling/Trigger.h b/DRAM/src/core/scheduling/Trigger.h
similarity index 89%
rename from DRAM/dram/core/scheduling/Trigger.h
rename to DRAM/src/core/scheduling/Trigger.h
index 461bc581..d4cf5091 100644
--- a/DRAM/dram/core/scheduling/Trigger.h
+++ b/DRAM/src/core/scheduling/Trigger.h
@@ -8,7 +8,7 @@
 #ifndef TRIGGER_H_
 #define TRIGGER_H_
 
-namespace controller {
+namespace core {
 
 enum Trigger {RefreshTrigger};
 
diff --git a/DRAM/dram/core/scheduling/checker/ActivateChecker.cpp b/DRAM/src/core/scheduling/checker/ActivateChecker.cpp
similarity index 98%
rename from DRAM/dram/core/scheduling/checker/ActivateChecker.cpp
rename to DRAM/src/core/scheduling/checker/ActivateChecker.cpp
index ce2f2f42..4505d78f 100644
--- a/DRAM/dram/core/scheduling/checker/ActivateChecker.cpp
+++ b/DRAM/src/core/scheduling/checker/ActivateChecker.cpp
@@ -11,7 +11,7 @@
 #include "core/scheduling/checker/ActivateChecker.h"
 
 
-namespace controller {
+namespace core {
 
 void ActivateChecker::check(ScheduledCommand& command) const
 {
diff --git a/DRAM/dram/core/scheduling/checker/ActivateChecker.h b/DRAM/src/core/scheduling/checker/ActivateChecker.h
similarity index 90%
rename from DRAM/dram/core/scheduling/checker/ActivateChecker.h
rename to DRAM/src/core/scheduling/checker/ActivateChecker.h
index 7f4cd2b9..a180bf30 100644
--- a/DRAM/dram/core/scheduling/checker/ActivateChecker.h
+++ b/DRAM/src/core/scheduling/checker/ActivateChecker.h
@@ -12,11 +12,11 @@
 #include "core/scheduling/checker/ICommandChecker.h"
 #include "core/Configuration.h"
 #include "core/utils/RingBuffer.h"
-#include "core/scheduling/CommandBus.h"
+#include "core/CommandBus.h"
 
-namespace controller {
+namespace core {
 
-class ActivateChecker: public controller::ICommandChecker
+class ActivateChecker: public core::ICommandChecker
 {
 public:
 	ActivateChecker(Configuration& config, CommandBus& commandBus) : config(config), bus(commandBus), nActivateWindow(config.nActivate - 1){}
diff --git a/DRAM/dram/core/scheduling/checker/ICommandChecker.h b/DRAM/src/core/scheduling/checker/ICommandChecker.h
similarity index 96%
rename from DRAM/dram/core/scheduling/checker/ICommandChecker.h
rename to DRAM/src/core/scheduling/checker/ICommandChecker.h
index f83385f2..357ada50 100644
--- a/DRAM/dram/core/scheduling/checker/ICommandChecker.h
+++ b/DRAM/src/core/scheduling/checker/ICommandChecker.h
@@ -11,7 +11,7 @@
 #include "systemc.h"
 #include "core/scheduling/ScheduledCommand.h"
 
-namespace controller {
+namespace core {
 
 class ICommandChecker
 {
diff --git a/DRAM/dram/core/scheduling/checker/PrechargeChecker.cpp b/DRAM/src/core/scheduling/checker/PrechargeChecker.cpp
similarity index 95%
rename from DRAM/dram/core/scheduling/checker/PrechargeChecker.cpp
rename to DRAM/src/core/scheduling/checker/PrechargeChecker.cpp
index b52ce2ee..cb69d26f 100644
--- a/DRAM/dram/core/scheduling/checker/PrechargeChecker.cpp
+++ b/DRAM/src/core/scheduling/checker/PrechargeChecker.cpp
@@ -7,7 +7,7 @@
 
 #include <core/scheduling/checker/PrechargeChecker.h>
 
-namespace controller {
+namespace core {
 
 void PrechargeChecker::check(ScheduledCommand& command) const
 {
diff --git a/DRAM/dram/core/scheduling/checker/PrechargeChecker.h b/DRAM/src/core/scheduling/checker/PrechargeChecker.h
similarity index 85%
rename from DRAM/dram/core/scheduling/checker/PrechargeChecker.h
rename to DRAM/src/core/scheduling/checker/PrechargeChecker.h
index 7aa7d417..5e011650 100644
--- a/DRAM/dram/core/scheduling/checker/PrechargeChecker.h
+++ b/DRAM/src/core/scheduling/checker/PrechargeChecker.h
@@ -10,11 +10,11 @@
 
 #include <core/scheduling/checker/ICommandChecker.h>
 #include "core/Configuration.h"
-#include "core/scheduling/CommandBus.h"
+#include "core/CommandBus.h"
 
-namespace controller {
+namespace core {
 
-class PrechargeChecker: public controller::ICommandChecker
+class PrechargeChecker: public core::ICommandChecker
 {
 public:
 	PrechargeChecker(const Configuration& config, const CommandBus& commandBus) : config(config), bus(commandBus) {}
diff --git a/DRAM/dram/core/scheduling/checker/ReadChecker.cpp b/DRAM/src/core/scheduling/checker/ReadChecker.cpp
similarity index 95%
rename from DRAM/dram/core/scheduling/checker/ReadChecker.cpp
rename to DRAM/src/core/scheduling/checker/ReadChecker.cpp
index 532dc04b..3934121e 100644
--- a/DRAM/dram/core/scheduling/checker/ReadChecker.cpp
+++ b/DRAM/src/core/scheduling/checker/ReadChecker.cpp
@@ -7,7 +7,7 @@
 
 #include <core/scheduling/checker/ReadChecker.h>
 
-namespace controller {
+namespace core {
 
 void ReadChecker::check(ScheduledCommand& command) const
 {
diff --git a/DRAM/dram/core/scheduling/checker/ReadChecker.h b/DRAM/src/core/scheduling/checker/ReadChecker.h
similarity index 85%
rename from DRAM/dram/core/scheduling/checker/ReadChecker.h
rename to DRAM/src/core/scheduling/checker/ReadChecker.h
index d929ab69..6232ca2d 100644
--- a/DRAM/dram/core/scheduling/checker/ReadChecker.h
+++ b/DRAM/src/core/scheduling/checker/ReadChecker.h
@@ -10,11 +10,11 @@
 
 #include <core/scheduling/checker/ICommandChecker.h>
 #include "core/Configuration.h"
-#include "core/scheduling/CommandBus.h"
+#include "core/CommandBus.h"
 
-namespace controller {
+namespace core {
 
-class ReadChecker: public controller::ICommandChecker
+class ReadChecker: public core::ICommandChecker
 {
 public:
 	ReadChecker(const Configuration& config, const CommandBus& commandBus) : config(config), bus(commandBus) {}
diff --git a/DRAM/dram/core/scheduling/checker/WriteChecker.cpp b/DRAM/src/core/scheduling/checker/WriteChecker.cpp
similarity index 95%
rename from DRAM/dram/core/scheduling/checker/WriteChecker.cpp
rename to DRAM/src/core/scheduling/checker/WriteChecker.cpp
index 55032ad9..b8544407 100644
--- a/DRAM/dram/core/scheduling/checker/WriteChecker.cpp
+++ b/DRAM/src/core/scheduling/checker/WriteChecker.cpp
@@ -7,7 +7,7 @@
 
 #include <core/scheduling/checker/WriteChecker.h>
 
-namespace controller {
+namespace core {
 
 void WriteChecker::check(ScheduledCommand& command) const
 {
diff --git a/DRAM/dram/core/scheduling/checker/WriteChecker.h b/DRAM/src/core/scheduling/checker/WriteChecker.h
similarity index 85%
rename from DRAM/dram/core/scheduling/checker/WriteChecker.h
rename to DRAM/src/core/scheduling/checker/WriteChecker.h
index e1531d98..c4c471f2 100644
--- a/DRAM/dram/core/scheduling/checker/WriteChecker.h
+++ b/DRAM/src/core/scheduling/checker/WriteChecker.h
@@ -10,11 +10,11 @@
 
 #include <core/scheduling/checker/ICommandChecker.h>
 #include "core/Configuration.h"
-#include "core/scheduling/CommandBus.h"
+#include "core/CommandBus.h"
 
-namespace controller {
+namespace core {
 
-class WriteChecker: public controller::ICommandChecker
+class WriteChecker: public core::ICommandChecker
 {
 public:
 	WriteChecker(const Configuration& config, const CommandBus& commandBus) : config(config), bus(commandBus) {}
diff --git a/DRAM/dram/core/utils/RingBuffer.h b/DRAM/src/core/utils/RingBuffer.h
similarity index 100%
rename from DRAM/dram/core/utils/RingBuffer.h
rename to DRAM/src/core/utils/RingBuffer.h
diff --git a/DRAM/dram/core/utils/Utils.cpp b/DRAM/src/core/utils/Utils.cpp
similarity index 100%
rename from DRAM/dram/core/utils/Utils.cpp
rename to DRAM/src/core/utils/Utils.cpp
diff --git a/DRAM/dram/core/utils/Utils.h b/DRAM/src/core/utils/Utils.h
similarity index 100%
rename from DRAM/dram/core/utils/Utils.h
rename to DRAM/src/core/utils/Utils.h
diff --git a/DRAM/src/tlm/ControllerWrapper.h b/DRAM/src/tlm/ControllerWrapper.h
new file mode 100644
index 00000000..240db21e
--- /dev/null
+++ b/DRAM/src/tlm/ControllerWrapper.h
@@ -0,0 +1,188 @@
+///*
+// * ControllerWrapper.h
+// *
+// *  Created on: Mar 15, 2014
+// *      Author: gernhard
+// */
+//
+//#ifndef CONTROLLERWRAPPER_H_
+//#define CONTROLLERWRAPPER_H_
+//
+//#include <tlm.h>
+//#include <systemc.h>
+//#include <tlm_utils/simple_target_socket.h>
+//#include <tlm_utils/simple_initiator_socket.h>
+//#include <tlm_utils/peq_with_cb_and_phase.h>
+//
+//#include "common/protocol.h"
+//#include "IControllerWrapper.h"
+//#include "core/Controller.h"
+//
+//using namespace std;
+//using namespace tlm;
+//using namespace controller;
+//
+//template<unsigned int BUSWIDTH = 128>
+//struct ControllerWrapper: public sc_module, public IControllerWrapper
+//{
+//public:
+//
+//	tlm_utils::simple_initiator_socket<ControllerWrapper, BUSWIDTH, tlm::tlm_base_protocol_types> iSocket;
+//	tlm_utils::simple_target_socket<ControllerWrapper, BUSWIDTH, tlm::tlm_base_protocol_types> tSocket;
+//
+//	SC_CTOR(ControllerWrapper) :
+//			controller(*this), frontendPEQ(this, &ControllerWrapper::frontendPEQCallback), dramPEQ(
+//					this, &ControllerWrapper::dramPEQCallback), controllerPEQ(this,
+//					&ControllerWrapper::controllerPEQCallback), inputBufferDelay(
+//					controller.config.Timings.clk)
+//	{
+//		iSocket.register_nb_transport_bw(this, &ControllerWrapper::nb_transport_bw);
+//		tSocket.register_nb_transport_fw(this, &ControllerWrapper::nb_transport_fw);
+//	}
+//
+//	~ControllerWrapper()
+//	{
+//	}
+//
+//	virtual void sendCommand(sc_time startTime, tlm::tlm_generic_payload& payload,
+//			controller::Command command)
+//	{
+//		assert(startTime >= sc_time_stamp());
+//		sc_time delay = startTime - sc_time_stamp();
+//		tlm::tlm_phase phase;
+//		switch (command)
+//		{
+//			case Read:
+//				phase = BEGIN_RD;
+//				break;
+//			case Write:
+//				phase = BEGIN_WR;
+//				break;
+//			case Refresh:
+//				phase = BEGIN_REFA;
+//				break;
+//			case Activate:
+//				phase = BEGIN_ACT;
+//				break;
+//			case Precharge:
+//				phase = BEGIN_PRE;
+//				break;
+//			default:
+//				SC_REPORT_FATAL(0, "unsupported command in controller wrapper");
+//				break;
+//		}
+//
+//		dramPEQ.notify(payload, phase, delay);
+//	}
+//
+//	virtual void sendTrigger(sc_time time, controller::Trigger trigger)
+//	{
+//		assert(time >= sc_time_stamp());
+//		sc_time delay = time - sc_time_stamp();
+//
+//	}
+//private:
+//	Controller controller;
+//	tlm_utils::peq_with_cb_and_phase<ControllerWrapper> frontendPEQ;
+//	tlm_utils::peq_with_cb_and_phase<ControllerWrapper> dramPEQ;
+//	tlm_utils::peq_with_cb_and_phase<ControllerWrapper> controllerPEQ;
+//
+//	sc_time inputBufferDelay;
+//	tlm::tlm_generic_payload triggerDummyPayload;
+//
+//	// Initiated by dram
+//	tlm_sync_enum nb_transport_bw(tlm_generic_payload& payload, tlm_phase& phase, sc_time& bwDelay)
+//	{
+//		dramPEQ.notify(payload, phase, bwDelay);
+//		return TLM_ACCEPTED;
+//	}
+//
+//	// Initiated by dram frontend
+//	tlm_sync_enum nb_transport_fw(tlm_generic_payload& payload, tlm_phase& phase, sc_time& fwDelay)
+//	{
+//		if (phase == BEGIN_REQ)
+//			payload.acquire();
+//		else if (phase == END_RESP)
+//			payload.release();
+//
+//		frontendPEQ.notify(payload, phase, fwDelay);
+//		return TLM_ACCEPTED;
+//	}
+//
+//	void frontendPEQCallback(tlm_generic_payload& payload, const tlm_phase& phase)
+//	{
+//		//todo : RECORDER
+//
+//		if (phase == BEGIN_REQ)
+//		{
+//			controller.schedule(sc_time_stamp() + inputBufferDelay, payload);
+//			sendToFrontend(payload, END_REQ, inputBufferDelay);
+//		}
+//		else if (phase == BEGIN_RESP)
+//		{
+//			sendToFrontend(payload, phase, SC_ZERO_TIME);
+//		}
+//		else if (phase == END_RESP)
+//		{
+//		}
+//
+//		else
+//		{
+//			SC_REPORT_FATAL(0,
+//					"Payload event queue in controller wrapper was triggered with unknown phase");
+//		}
+//	}
+//
+//	void dramPEQCallback(tlm_generic_payload& payload, const tlm_phase& phase)
+//	{
+//		//todo : RECORDER
+//		if (phase == BEGIN_RD || phase == BEGIN_WR || phase == BEGIN_REFA || phase == BEGIN_ACT
+//				|| phase == BEGIN_PRE)
+//		{
+//			sendToDram(payload, phase, SC_ZERO_TIME);
+//		}
+//		else if (phase == END_RD || phase == END_WR)
+//		{
+//			frontendPEQ.notif(payload, BEGIN_RESP, SC_ZERO_TIME);
+//		}
+//		else if (phase == END_PRE || phase == END_ACT || phase == END_REFA)
+//		{
+//
+//		}
+//		else
+//		{
+//			SC_REPORT_FATAL(0,
+//					"dramPEQCallback queue in controller wrapper was triggered with unknown phase");
+//		}
+//	}
+//
+//	void controllerPEQCallback(tlm_generic_payload& payload, const tlm_phase& phase)
+//	{
+//		if (phase == REFRESH_TRIGGER)
+//		{
+//			controller.refreshManager.scheduleRefresh(sc_time_stamp());
+//		}
+//		else
+//		{
+//			SC_REPORT_FATAL(0,
+//					"controllerPEQCallback queue in controller wrapper was triggered with unknown phase");
+//		}
+//	}
+//
+//	void sendToDram(tlm_generic_payload& payload, const tlm_phase& phase, const sc_time& delay)
+//	{
+//		tlm_phase TPhase = phase;
+//		sc_time TDelay = delay;
+//		iSocket->nb_transport_fw(payload, TPhase, TDelay);
+//	}
+//
+//	void sendToFrontend(tlm_generic_payload& payload, const tlm_phase& phase, const sc_time& delay)
+//	{
+//		tlm_phase TPhase = phase;
+//		sc_time TDelay = delay;
+//		tSocket->nb_transport_bw(payload, TPhase, TDelay);
+//	}
+//
+//};
+//
+//#endif /* CONTROLLERWRAPPER_H_ */
diff --git a/DRAM/src/tlm/IControllerWrapper.h b/DRAM/src/tlm/IControllerWrapper.h
new file mode 100644
index 00000000..7cf31a46
--- /dev/null
+++ b/DRAM/src/tlm/IControllerWrapper.h
@@ -0,0 +1,23 @@
+/*
+ * IControllerWrapper.h
+ *
+ *  Created on: Mar 15, 2014
+ *      Author: gernhard
+ */
+
+#ifndef ICONTROLLERWRAPPER_H_
+#define ICONTROLLERWRAPPER_H_
+#include <tlm.h>
+#include <systemc.h>
+#include "../core/Command.h"
+#include "../core/scheduling/Trigger.h"
+
+class IControllerWrapper{
+public:
+	virtual void sendCommand(sc_time startTime, tlm::tlm_generic_payload& payload, core::Command command) = 0;
+	virtual void sendTrigger(sc_time time, core::Trigger trigger) = 0;
+	virtual ~IControllerWrapper(){}
+};
+
+
+#endif /* ICONTROLLERWRAPPER_H_ */
diff --git a/DRAM/testing/BankwiseRefreshManager_test.cpp b/DRAM/testing/BankwiseRefreshManager_test.cpp
index abbb18e8..809faa92 100644
--- a/DRAM/testing/BankwiseRefreshManager_test.cpp
+++ b/DRAM/testing/BankwiseRefreshManager_test.cpp
@@ -14,7 +14,7 @@
 using namespace testing;
 
 
-namespace controller {
+namespace core {
 
 class MockInternalScheduler: public IInternalScheduler
 {
diff --git a/DRAM/testing/CommandBus_test.cpp b/DRAM/testing/CommandBus_test.cpp
index ea54e8d6..24b00035 100644
--- a/DRAM/testing/CommandBus_test.cpp
+++ b/DRAM/testing/CommandBus_test.cpp
@@ -1,116 +1,116 @@
-/*
- * CommandBus_test.cpp
- *
- *  Created on: Mar 13, 2014
- *      Author: jonny
- */
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-#include "testUtils.h"
-#include "core/scheduling/ScheduledCommand.h"
-#include "core/Configuration.h"
-#include "core/ControllerState.h"
-#include "core/scheduling/CommandBus.h"
-
-using ::testing::_;
-using ::testing::AtLeast;
-using ::testing::Expectation;
-using namespace testing;
-using namespace std;
-
-namespace controller {
-
-class CommandBusTest: public Test
-{
-public:
-	CommandBusTest() : config(), state(config.numberOfBanks), bus(config, state, checker), clk(config.Timings.clk){}
-
-	Configuration config;
-	ControllerState state;
-	CommandBus bus;
-
-	std::vector<ICommandChecker*> checker;
-	sc_time clk;
-};
-
-TEST_F(CommandBusTest, cleanUpBusWorks)
-{
-	shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
-	ScheduledCommand cmd1(*dummy.get(), Read, 2*clk, clk);
-	ScheduledCommand cmd2(*dummy.get(), Read, 3*clk, clk);
-	ScheduledCommand cmd3(*dummy.get(), Read, 5*clk, clk);
-	ScheduledCommand cmd4(*dummy.get(), Read, 7*clk, clk);
-
-	bus.scheduleCommand(cmd1);
-	bus.scheduleCommand(cmd2);
-	bus.scheduleCommand(cmd3);
-	bus.scheduleCommand(cmd4);
-
-	EXPECT_EQ(4, bus.getPendingBusCommands().size());
-
-	bus.cleanUpBus(5*clk);
-
-	EXPECT_EQ(2, bus.getPendingBusCommands().size());
-}
-
-
-TEST_F(CommandBusTest, getEarliestStartTimeWorks)
-{
-	shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
-	ScheduledCommand cmd1(*dummy.get(), Read, 2*clk, clk);
-	ScheduledCommand cmd2(*dummy.get(), Read, 3*clk, clk);
-	ScheduledCommand cmd3(*dummy.get(), Read, 5*clk, clk);
-	ScheduledCommand cmd4(*dummy.get(), Read, 7*clk, clk);
-
-	ScheduledCommand collision(*dummy.get(), Read, 3*clk, clk);
-	ScheduledCommand noCollision(*dummy.get(), Read, 6*clk, clk);
-
-	bus.scheduleCommand(cmd1);
-	bus.scheduleCommand(cmd2);
-	bus.scheduleCommand(cmd3);
-	bus.scheduleCommand(cmd4);
-
-	EXPECT_EQ(4*clk, bus.getEarliestStartTime(collision));
-	EXPECT_EQ(6*clk, bus.getEarliestStartTime(noCollision));
-}
-
-
-TEST_F(CommandBusTest, getESTDiesWithNotClkAligned)
-{
-	shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
-	ScheduledCommand notAligned(*dummy.get(), Read, 2.5*clk, clk);
-
-	EXPECT_DEATH(bus.getEarliestStartTime(notAligned), ".*");
-}
-
-TEST_F(CommandBusTest, getLastCommandWorks)
-{
-	shared_ptr<tlm::tlm_generic_payload> dummy0 = createDummyPayload(Thread(0), Bank(0));
-	shared_ptr<tlm::tlm_generic_payload> dummy2 = createDummyPayload(Thread(0), Bank(2));
-
-	ScheduledCommand read0(*dummy0.get(), Read, 2*clk, clk);
-	ScheduledCommand read2(*dummy2.get(), Read, 3*clk, clk);
-	bus.scheduleCommand(read0);
-	bus.scheduleCommand(read2);
-
-	EXPECT_EQ(read0, bus.getLastCommand(Read, read0.getBank()));
-	EXPECT_EQ(read2, bus.getLastCommand(Read, read2.getBank()));
-	EXPECT_EQ(read2.getStart(), bus.getLastCommand(Read).getStart());
-}
-
-TEST_F(CommandBusTest, notYetScheduledWorks)
-{
-	shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload(Thread(0), Bank(0));
-	ScheduledCommand read(*dummy.get(), Read, 2*clk, clk);
-
-	EXPECT_TRUE(bus.notYetScheduled(Read));
-	bus.scheduleCommand(read);
-	EXPECT_FALSE(bus.notYetScheduled(Read));
-}
-
-
-} /* namespace controller */
-
-
-
-
+///*
+// * CommandBus_test.cpp
+// *
+// *  Created on: Mar 13, 2014
+// *      Author: jonny
+// */
+//#include <gtest/gtest.h>
+//#include <gmock/gmock.h>
+//#include "testUtils.h"
+//#include "core/scheduling/ScheduledCommand.h"
+//#include "core/Configuration.h"
+//#include "core/ControllerState.h"
+//#include "core/CommandBus.h"
+//
+//using ::testing::_;
+//using ::testing::AtLeast;
+//using ::testing::Expectation;
+//using namespace testing;
+//using namespace std;
+//
+//namespace core {
+//
+//class CommandBusTest: public Test
+//{
+//public:
+//	CommandBusTest() : config(), state(config.numberOfBanks), bus(config, state, checker), clk(config.Timings.clk){}
+//
+//	Configuration config;
+//	ControllerState state;
+//	CommandBus bus;
+//
+//	std::vector<ICommandChecker*> checker;
+//	sc_time clk;
+//};
+//
+//TEST_F(CommandBusTest, cleanUpBusWorks)
+//{
+//	shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
+//	ScheduledCommand cmd1(*dummy.get(), Read, 2*clk, clk);
+//	ScheduledCommand cmd2(*dummy.get(), Read, 3*clk, clk);
+//	ScheduledCommand cmd3(*dummy.get(), Read, 5*clk, clk);
+//	ScheduledCommand cmd4(*dummy.get(), Read, 7*clk, clk);
+//
+//	bus.scheduleCommand(cmd1);
+//	bus.scheduleCommand(cmd2);
+//	bus.scheduleCommand(cmd3);
+//	bus.scheduleCommand(cmd4);
+//
+//	EXPECT_EQ(4, bus.getPendingBusCommands().size());
+//
+//	bus.cleanUpBus(5*clk);
+//
+//	EXPECT_EQ(2, bus.getPendingBusCommands().size());
+//}
+//
+//
+//TEST_F(CommandBusTest, getEarliestStartTimeWorks)
+//{
+//	shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
+//	ScheduledCommand cmd1(*dummy.get(), Read, 2*clk, clk);
+//	ScheduledCommand cmd2(*dummy.get(), Read, 3*clk, clk);
+//	ScheduledCommand cmd3(*dummy.get(), Read, 5*clk, clk);
+//	ScheduledCommand cmd4(*dummy.get(), Read, 7*clk, clk);
+//
+//	ScheduledCommand collision(*dummy.get(), Read, 3*clk, clk);
+//	ScheduledCommand noCollision(*dummy.get(), Read, 6*clk, clk);
+//
+//	bus.scheduleCommand(cmd1);
+//	bus.scheduleCommand(cmd2);
+//	bus.scheduleCommand(cmd3);
+//	bus.scheduleCommand(cmd4);
+//
+//	EXPECT_EQ(4*clk, bus.getEarliestStartTime(collision));
+//	EXPECT_EQ(6*clk, bus.getEarliestStartTime(noCollision));
+//}
+//
+//
+//TEST_F(CommandBusTest, getESTDiesWithNotClkAligned)
+//{
+//	shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
+//	ScheduledCommand notAligned(*dummy.get(), Read, 2.5*clk, clk);
+//
+//	EXPECT_DEATH(bus.getEarliestStartTime(notAligned), ".*");
+//}
+//
+//TEST_F(CommandBusTest, getLastCommandWorks)
+//{
+//	shared_ptr<tlm::tlm_generic_payload> dummy0 = createDummyPayload(Thread(0), Bank(0));
+//	shared_ptr<tlm::tlm_generic_payload> dummy2 = createDummyPayload(Thread(0), Bank(2));
+//
+//	ScheduledCommand read0(*dummy0.get(), Read, 2*clk, clk);
+//	ScheduledCommand read2(*dummy2.get(), Read, 3*clk, clk);
+//	bus.scheduleCommand(read0);
+//	bus.scheduleCommand(read2);
+//
+//	EXPECT_EQ(read0, bus.getLastCommand(Read, read0.getBank()));
+//	EXPECT_EQ(read2, bus.getLastCommand(Read, read2.getBank()));
+//	EXPECT_EQ(read2.getStart(), bus.getLastCommand(Read).getStart());
+//}
+//
+//TEST_F(CommandBusTest, notYetScheduledWorks)
+//{
+//	shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload(Thread(0), Bank(0));
+//	ScheduledCommand read(*dummy.get(), Read, 2*clk, clk);
+//
+//	EXPECT_TRUE(bus.notYetScheduled(Read));
+//	bus.scheduleCommand(read);
+//	EXPECT_FALSE(bus.notYetScheduled(Read));
+//}
+//
+//
+//} /* namespace controller */
+//
+//
+//
+//
diff --git a/DRAM/testing/CommandGenerator_test.cpp b/DRAM/testing/CommandGenerator_test.cpp
index 0cb04cf6..e2875f32 100644
--- a/DRAM/testing/CommandGenerator_test.cpp
+++ b/DRAM/testing/CommandGenerator_test.cpp
@@ -4,7 +4,7 @@
 #include "core/scheduling/CommandSequenceGenerator.h"
 #include "testUtils.h"
 
-using namespace controller;
+using namespace core;
 
 using namespace std;
 
diff --git a/DRAM/testing/CommandSequenceScheduler_test.cpp b/DRAM/testing/CommandSequenceScheduler_test.cpp
index 64087137..f1db894b 100644
--- a/DRAM/testing/CommandSequenceScheduler_test.cpp
+++ b/DRAM/testing/CommandSequenceScheduler_test.cpp
@@ -7,6 +7,6 @@
 
 #include <core/scheduling/CommandSequenceScheduler.h>
 
-namespace controller {
+namespace core {
 
 } /* namespace controller */
diff --git a/DRAM/testing/Controller_test.cpp b/DRAM/testing/Controller_test.cpp
new file mode 100644
index 00000000..7c79c499
--- /dev/null
+++ b/DRAM/testing/Controller_test.cpp
@@ -0,0 +1,40 @@
+/*
+ * Controller_test.cpp
+ *
+ *  Created on: Mar 15, 2014
+ *      Author: gernhard
+ */
+
+
+
+
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <core/refresh/BankwiseRefreshManager.h>
+#include "tlm/IControllerWrapper.h"
+#include "testUtils.h"
+#include "common/dramExtension.h"
+#include "core/Controller.h"
+#include <tlm.h>
+
+using namespace std;
+using namespace testing;
+
+
+namespace core {
+
+class MockWrapper: public IControllerWrapper
+{
+public:
+	MOCK_METHOD3(sendCommand, void (sc_time time, tlm::tlm_generic_payload& payload, Command command));
+	MOCK_METHOD2(sendTrigger, void (sc_time time, Trigger trigger));
+};
+
+TEST(controllerTest,controllerStartup)
+{
+	MockWrapper wrapper;
+	DramController controller(wrapper);
+}
+
+}
diff --git a/DRAM/testing/PowerDownManager_test.cpp b/DRAM/testing/PowerDownManager_test.cpp
index 8a2edda7..e774026d 100644
--- a/DRAM/testing/PowerDownManager_test.cpp
+++ b/DRAM/testing/PowerDownManager_test.cpp
@@ -7,6 +7,6 @@
 
 #include <core/powerdown/PowerDownManager.h>
 
-namespace controller {
+namespace core {
 
 } /* namespace controller */
diff --git a/DRAM/testing/RefreshManager_test.cpp b/DRAM/testing/RefreshManager_test.cpp
index d3c35cba..12666df5 100644
--- a/DRAM/testing/RefreshManager_test.cpp
+++ b/DRAM/testing/RefreshManager_test.cpp
@@ -15,7 +15,7 @@ using ::testing::Expectation;
 
 using namespace testing;
 
-namespace controller {
+namespace core {
 
 class MockInternalScheduler: public IInternalScheduler
 {
diff --git a/DRAM/testing/Utils_test.cpp b/DRAM/testing/Utils_test.cpp
index be265dd4..841a147c 100644
--- a/DRAM/testing/Utils_test.cpp
+++ b/DRAM/testing/Utils_test.cpp
@@ -11,7 +11,7 @@
 
 //using namespace testing;
 
-namespace controller {
+namespace core {
 
 TEST(UtilsTest, clkAlignWorks)
 {
diff --git a/DRAM/testing/checker/ActivateChecker_test.cpp b/DRAM/testing/checker/ActivateChecker_test.cpp
index de42c3c0..a38c1ff2 100644
--- a/DRAM/testing/checker/ActivateChecker_test.cpp
+++ b/DRAM/testing/checker/ActivateChecker_test.cpp
@@ -7,6 +7,6 @@
 
 #include <core/scheduling/checker/ActivateChecker.h>
 
-namespace controller {
+namespace core {
 
 } /* namespace controller */
diff --git a/DRAM/testing/checker/PrechargeChecker_test.cpp b/DRAM/testing/checker/PrechargeChecker_test.cpp
index 5d92b8eb..6fcbde52 100644
--- a/DRAM/testing/checker/PrechargeChecker_test.cpp
+++ b/DRAM/testing/checker/PrechargeChecker_test.cpp
@@ -7,6 +7,6 @@
 
 #include <core/scheduling/checker/PrechargeChecker.h>
 
-namespace controller {
+namespace core {
 
 } /* namespace controller */
diff --git a/DRAM/testing/checker/ReadChecker_test.cpp b/DRAM/testing/checker/ReadChecker_test.cpp
index ebe3b0fb..5af9ee64 100644
--- a/DRAM/testing/checker/ReadChecker_test.cpp
+++ b/DRAM/testing/checker/ReadChecker_test.cpp
@@ -7,6 +7,6 @@
 
 #include <core/scheduling/checker/ReadChecker.h>
 
-namespace controller {
+namespace core {
 
 } /* namespace controller */
diff --git a/DRAM/testing/checker/WriteChecker_test.cpp b/DRAM/testing/checker/WriteChecker_test.cpp
index 2ba76e6c..af3637d2 100644
--- a/DRAM/testing/checker/WriteChecker_test.cpp
+++ b/DRAM/testing/checker/WriteChecker_test.cpp
@@ -7,6 +7,6 @@
 
 #include <core/scheduling/checker/WriteChecker.h>
 
-namespace controller {
+namespace core {
 
 } /* namespace controller */
diff --git a/DRAM/main.cpp b/DRAM/testing/main.cpp
similarity index 100%
rename from DRAM/main.cpp
rename to DRAM/testing/main.cpp