diff --git a/vlsisapd/src/openChams/CMakeLists.txt b/vlsisapd/src/openChams/CMakeLists.txt
index 5466cd29..4b7537b5 100644
--- a/vlsisapd/src/openChams/CMakeLists.txt
+++ b/vlsisapd/src/openChams/CMakeLists.txt
@@ -1,33 +1 @@
-INCLUDE_DIRECTORIES(${CHAMS_SOURCE_DIR}/openChams ${LIBXML2_INCLUDE_DIR})
-
-SET ( includes
-        Circuit.h
-        Netlist.h
-        Instance.h
-        Net.h
-        Name.h
-        Operator.h
-        Parameters.h
-        Schematic.h
-        Sizing.h
-        Transistor.h
-        OpenChamsException.h )
-SET ( cpps
-        Circuit.cpp
-        Netlist.cpp
-        Instance.cpp
-        Net.cpp
-        Name.cpp
-        Operator.cpp
-        Parameters.cpp
-        Schematic.cpp
-        Sizing.cpp
-        Transistor.cpp )
-
-ADD_LIBRARY(openChams ${cpps})
-
-TARGET_LINK_LIBRARIES(openChams ${LIBXML2_LIBRARIES})
-
-INSTALL(TARGETS openChams DESTINATION lib${LIB_SUFFIX} )
-
-INSTALL(FILES ${includes} DESTINATION include/vlsisapd/openChams)
+ADD_SUBDIRECTORY(src)
diff --git a/vlsisapd/src/openChams/Circuit.cpp b/vlsisapd/src/openChams/src/Circuit.cpp
similarity index 100%
rename from vlsisapd/src/openChams/Circuit.cpp
rename to vlsisapd/src/openChams/src/Circuit.cpp
diff --git a/vlsisapd/src/openChams/Instance.cpp b/vlsisapd/src/openChams/src/Instance.cpp
similarity index 100%
rename from vlsisapd/src/openChams/Instance.cpp
rename to vlsisapd/src/openChams/src/Instance.cpp
diff --git a/vlsisapd/src/openChams/Name.cpp b/vlsisapd/src/openChams/src/Name.cpp
similarity index 100%
rename from vlsisapd/src/openChams/Name.cpp
rename to vlsisapd/src/openChams/src/Name.cpp
diff --git a/vlsisapd/src/openChams/Net.cpp b/vlsisapd/src/openChams/src/Net.cpp
similarity index 100%
rename from vlsisapd/src/openChams/Net.cpp
rename to vlsisapd/src/openChams/src/Net.cpp
diff --git a/vlsisapd/src/openChams/Netlist.cpp b/vlsisapd/src/openChams/src/Netlist.cpp
similarity index 100%
rename from vlsisapd/src/openChams/Netlist.cpp
rename to vlsisapd/src/openChams/src/Netlist.cpp
diff --git a/vlsisapd/src/openChams/Operator.cpp b/vlsisapd/src/openChams/src/Operator.cpp
similarity index 100%
rename from vlsisapd/src/openChams/Operator.cpp
rename to vlsisapd/src/openChams/src/Operator.cpp
diff --git a/vlsisapd/src/openChams/Parameters.cpp b/vlsisapd/src/openChams/src/Parameters.cpp
similarity index 100%
rename from vlsisapd/src/openChams/Parameters.cpp
rename to vlsisapd/src/openChams/src/Parameters.cpp
diff --git a/vlsisapd/src/openChams/Schematic.cpp b/vlsisapd/src/openChams/src/Schematic.cpp
similarity index 100%
rename from vlsisapd/src/openChams/Schematic.cpp
rename to vlsisapd/src/openChams/src/Schematic.cpp
diff --git a/vlsisapd/src/openChams/Sizing.cpp b/vlsisapd/src/openChams/src/Sizing.cpp
similarity index 100%
rename from vlsisapd/src/openChams/Sizing.cpp
rename to vlsisapd/src/openChams/src/Sizing.cpp
diff --git a/vlsisapd/src/openChams/Transistor.cpp b/vlsisapd/src/openChams/src/Transistor.cpp
similarity index 100%
rename from vlsisapd/src/openChams/Transistor.cpp
rename to vlsisapd/src/openChams/src/Transistor.cpp
diff --git a/vlsisapd/src/openChams/Circuit.h b/vlsisapd/src/openChams/src/vlsisapd/openChams/Circuit.h
similarity index 100%
rename from vlsisapd/src/openChams/Circuit.h
rename to vlsisapd/src/openChams/src/vlsisapd/openChams/Circuit.h
diff --git a/vlsisapd/src/openChams/Instance.h b/vlsisapd/src/openChams/src/vlsisapd/openChams/Instance.h
similarity index 100%
rename from vlsisapd/src/openChams/Instance.h
rename to vlsisapd/src/openChams/src/vlsisapd/openChams/Instance.h
diff --git a/vlsisapd/src/openChams/Name.h b/vlsisapd/src/openChams/src/vlsisapd/openChams/Name.h
similarity index 100%
rename from vlsisapd/src/openChams/Name.h
rename to vlsisapd/src/openChams/src/vlsisapd/openChams/Name.h
diff --git a/vlsisapd/src/openChams/Net.h b/vlsisapd/src/openChams/src/vlsisapd/openChams/Net.h
similarity index 100%
rename from vlsisapd/src/openChams/Net.h
rename to vlsisapd/src/openChams/src/vlsisapd/openChams/Net.h
diff --git a/vlsisapd/src/openChams/Netlist.h b/vlsisapd/src/openChams/src/vlsisapd/openChams/Netlist.h
similarity index 100%
rename from vlsisapd/src/openChams/Netlist.h
rename to vlsisapd/src/openChams/src/vlsisapd/openChams/Netlist.h
diff --git a/vlsisapd/src/openChams/OpenChamsException.h b/vlsisapd/src/openChams/src/vlsisapd/openChams/OpenChamsException.h
similarity index 100%
rename from vlsisapd/src/openChams/OpenChamsException.h
rename to vlsisapd/src/openChams/src/vlsisapd/openChams/OpenChamsException.h
diff --git a/vlsisapd/src/openChams/Operator.h b/vlsisapd/src/openChams/src/vlsisapd/openChams/Operator.h
similarity index 100%
rename from vlsisapd/src/openChams/Operator.h
rename to vlsisapd/src/openChams/src/vlsisapd/openChams/Operator.h
diff --git a/vlsisapd/src/openChams/Parameters.h b/vlsisapd/src/openChams/src/vlsisapd/openChams/Parameters.h
similarity index 100%
rename from vlsisapd/src/openChams/Parameters.h
rename to vlsisapd/src/openChams/src/vlsisapd/openChams/Parameters.h
diff --git a/vlsisapd/src/openChams/Schematic.h b/vlsisapd/src/openChams/src/vlsisapd/openChams/Schematic.h
similarity index 100%
rename from vlsisapd/src/openChams/Schematic.h
rename to vlsisapd/src/openChams/src/vlsisapd/openChams/Schematic.h
diff --git a/vlsisapd/src/openChams/Sizing.h b/vlsisapd/src/openChams/src/vlsisapd/openChams/Sizing.h
similarity index 100%
rename from vlsisapd/src/openChams/Sizing.h
rename to vlsisapd/src/openChams/src/vlsisapd/openChams/Sizing.h
diff --git a/vlsisapd/src/openChams/Transistor.h b/vlsisapd/src/openChams/src/vlsisapd/openChams/Transistor.h
similarity index 100%
rename from vlsisapd/src/openChams/Transistor.h
rename to vlsisapd/src/openChams/src/vlsisapd/openChams/Transistor.h