diff --git a/chamsin/src/CMakeLists.txt b/chamsin/src/CMakeLists.txt
index 789d6e6e..77d85dcb 100644
--- a/chamsin/src/CMakeLists.txt
+++ b/chamsin/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-ADD_SUBDIRECTORY(analogic)
 ADD_SUBDIRECTORY(dtr)
+ADD_SUBDIRECTORY(analogic)
 ADD_SUBDIRECTORY(device)
 ADD_SUBDIRECTORY(tests)
diff --git a/chamsin/src/analogic/CMakeLists.txt b/chamsin/src/analogic/CMakeLists.txt
index ce73afcb..467b93e8 100644
--- a/chamsin/src/analogic/CMakeLists.txt
+++ b/chamsin/src/analogic/CMakeLists.txt
@@ -3,10 +3,9 @@ INCLUDE_DIRECTORIES(${CHAMSIN_SOURCE_DIR}/src/dtr ${HURRICANE_INCLUDE_DIR} ${sou
 ADD_LIBRARY(analogic SHARED 
 GenV1Trans.cpp
 MetaTransistor.cpp
-RdsUnit.cpp
 Transistor.cpp
 TwoSpaces.cpp)
 
-TARGET_LINK_LIBRARIES(analogic ${HURRICANE_LIBRARIES})
+TARGET_LINK_LIBRARIES(analogic dtr ${HURRICANE_LIBRARIES})
 
 INSTALL(TARGETS analogic DESTINATION /lib)
diff --git a/chamsin/src/dtr/CMakeLists.txt b/chamsin/src/dtr/CMakeLists.txt
index 0e2c10fe..c9c39138 100644
--- a/chamsin/src/dtr/CMakeLists.txt
+++ b/chamsin/src/dtr/CMakeLists.txt
@@ -32,6 +32,10 @@ SET_SOURCE_FILES_PROPERTIES(${binary_dir}/ParserDtrScan.cpp GENERATED)
 ADD_LIBRARY(dtr SHARED
 ${DST_SRCS}
 DtrAccess.cpp
+RdsUnit.cpp
 GenericDtrAccess.cpp)
 
+
+TARGET_LINK_LIBRARIES(dtr ${HURRICANE_LIBRARIES})
+
 INSTALL(TARGETS dtr DESTINATION /lib)
diff --git a/chamsin/src/analogic/RdsUnit.cpp b/chamsin/src/dtr/RdsUnit.cpp
similarity index 100%
rename from chamsin/src/analogic/RdsUnit.cpp
rename to chamsin/src/dtr/RdsUnit.cpp
diff --git a/chamsin/src/analogic/RdsUnit.h b/chamsin/src/dtr/RdsUnit.h
similarity index 100%
rename from chamsin/src/analogic/RdsUnit.h
rename to chamsin/src/dtr/RdsUnit.h