Refactoring

SDM moved out
RDM moved out
+ many things