diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73a2350..e470330 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ find_package(PythonLibs)
 find_package(PythonExtensions)
 find_package(Cython REQUIRED)
 
-set(TOOLS_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/siliconcompiler/setup/_tools.py)
+set(TOOLS_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/siliconcompiler/siliconcompiler/toolscripts/_tools.py)
 
 execute_process(
   COMMAND python3 ${TOOLS_SCRIPT} --tool openroad --field git-url
diff --git a/siliconcompiler b/siliconcompiler
index 55a8350..6f85985 160000
--- a/siliconcompiler
+++ b/siliconcompiler
@@ -1 +1 @@
-Subproject commit 55a8350006c95e7b92b3f4f02038d54f1d5f2366
+Subproject commit 6f859851203033a3b576c0a8264bf66dc0068540