diff --git a/vlsisapd/src/agds/CMakeLists.txt b/vlsisapd/src/agds/CMakeLists.txt
index 879c6cbf..4b7537b5 100644
--- a/vlsisapd/src/agds/CMakeLists.txt
+++ b/vlsisapd/src/agds/CMakeLists.txt
@@ -1,16 +1 @@
-INCLUDE_DIRECTORIES(${VLSISAPD_SOURCE_DIR}/src/agds)
-
-SET ( includes vlsisapd/agds/GdsLibrary.h 
-               vlsisapd/agds/GdsStructure.h 
-               vlsisapd/agds/GdsElement.h 
-               vlsisapd/agds/GdsRectangle.h 
-    )
-SET ( cpps GdsLibrary.cpp 
-           GdsStructure.cpp 
-           GdsRectangle.cpp 
-    )
-
-ADD_LIBRARY(agds ${cpps})
-INSTALL(TARGETS agds DESTINATION lib${LIB_SUFFIX})
-
-INSTALL(FILES ${includes} DESTINATION include/vlsisapd/agds)
+ADD_SUBDIRECTORY(src)
diff --git a/vlsisapd/src/agds/GdsLibrary.cpp b/vlsisapd/src/agds/src/GdsLibrary.cpp
similarity index 100%
rename from vlsisapd/src/agds/GdsLibrary.cpp
rename to vlsisapd/src/agds/src/GdsLibrary.cpp
diff --git a/vlsisapd/src/agds/GdsRectangle.cpp b/vlsisapd/src/agds/src/GdsRectangle.cpp
similarity index 100%
rename from vlsisapd/src/agds/GdsRectangle.cpp
rename to vlsisapd/src/agds/src/GdsRectangle.cpp
diff --git a/vlsisapd/src/agds/GdsStructure.cpp b/vlsisapd/src/agds/src/GdsStructure.cpp
similarity index 100%
rename from vlsisapd/src/agds/GdsStructure.cpp
rename to vlsisapd/src/agds/src/GdsStructure.cpp
diff --git a/vlsisapd/src/agds/vlsisapd/agds/GdsElement.h b/vlsisapd/src/agds/src/vlsisapd/agds/GdsElement.h
similarity index 100%
rename from vlsisapd/src/agds/vlsisapd/agds/GdsElement.h
rename to vlsisapd/src/agds/src/vlsisapd/agds/GdsElement.h
diff --git a/vlsisapd/src/agds/vlsisapd/agds/GdsLibrary.h b/vlsisapd/src/agds/src/vlsisapd/agds/GdsLibrary.h
similarity index 100%
rename from vlsisapd/src/agds/vlsisapd/agds/GdsLibrary.h
rename to vlsisapd/src/agds/src/vlsisapd/agds/GdsLibrary.h
diff --git a/vlsisapd/src/agds/vlsisapd/agds/GdsRectangle.h b/vlsisapd/src/agds/src/vlsisapd/agds/GdsRectangle.h
similarity index 100%
rename from vlsisapd/src/agds/vlsisapd/agds/GdsRectangle.h
rename to vlsisapd/src/agds/src/vlsisapd/agds/GdsRectangle.h
diff --git a/vlsisapd/src/agds/vlsisapd/agds/GdsStructure.h b/vlsisapd/src/agds/src/vlsisapd/agds/GdsStructure.h
similarity index 100%
rename from vlsisapd/src/agds/vlsisapd/agds/GdsStructure.h
rename to vlsisapd/src/agds/src/vlsisapd/agds/GdsStructure.h