diff --git a/Makefile.in b/Makefile.in
index 6f1dce5..506a67e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,48 +89,17 @@
 common_install:
 	@if test -w $(datadir) ; then \
 		mkdir -p $(datadir)/pdk/scripts/ ;\
-		cp runtime/cace.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/cace_datasheet_upload.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/cace_design_upload.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/cace_gensim.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/cace_launch.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/cace_makeplot.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/cdl2spi.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/change_gds_cell.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/change_gds_date.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/change_gds_string.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/changepath.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/characterize_help.txt $(datadir)/pdk/scripts/ ;\
-		cp runtime/cleanup_unref.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/config.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/consoletext.py $(datadir)/pdk/scripts/ ;\
-		${CPP} -DPREFIX=$(datadir) runtime/create_project.py \
-			$(datadir)/pdk/scripts/create_project.py ;\
-		cp runtime/editparam.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/failreport.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/find_gds_prefix.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/foundry_nodes.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/helpwindow.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/listboxchoice.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/lvs_help.txt $(datadir)/pdk/scripts/ ;\
-		cp runtime/make_icon_from_soft.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/makestub.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/manager_help.txt $(datadir)/pdk/scripts/ ;\
-		cp runtime/netlist_to_layout.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/padframe_generator.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/profile.py $(datadir)/pdk/scripts/ ;\
-		${CPP} -DPREFIX=$(datadir) runtime/project_manager.py \
-			$(datadir)/pdk/scripts/project_manager.py ;\
-		cp runtime/qflow_help.txt $(datadir)/pdk/scripts/ ;\
-		cp runtime/rename_project.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/settings.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/simhints.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/soc_floorplanner.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/symbolbuilder.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/tksimpledialog.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/tooltip.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/treeviewchoice.py $(datadir)/pdk/scripts/ ;\
-		cp runtime/treeviewsplit.py $(datadir)/pdk/scripts/ ;\
+		mkdir -p $(datadir)/pdk/runtime ;\
+		for file in runtime/*.py ; do \
+			${CPP} -DPREFIX=$(datadir) $$file \
+			$(datadir)/pdk/$$file ;\
+		done ;\
+		for file in runtime/*.txt ; do \
+			${CPP} -DPREFIX=$(datadir) $$file \
+			$(datadir)/pdk/$$file ;\
+		done ;\
+		mv $(datadir)/pdk/runtime/* $(datadir)/pdk/scripts ;\
+		rm -r -f $(datadir)/pdk/runtime ;\
 		echo "Common install:  Done." ;\
 	else \
 		echo "Common install:  $(datadir) is not writeable (ignoring)." ;\
diff --git a/runtime/config.py b/runtime/config.py
index a730732..7485171 100755
--- a/runtime/config.py
+++ b/runtime/config.py
@@ -16,8 +16,7 @@
 #
 import configparser
 #TODO: replace path with PREFIX
-apps_path="/usr/share/pdk/bin"
-#apps_path="PREFIX/pdk/bin"
+apps_path="PREFIX/pdk/bin"
 
 config = configparser.ConfigParser(strict=False, allow_no_value=True)
 try:
diff --git a/runtime/project_manager.py b/runtime/project_manager.py
index 4747b52..245eeee 100755
--- a/runtime/project_manager.py
+++ b/runtime/project_manager.py
@@ -274,7 +274,7 @@
         # TODO: stop hardwired default EFXH035B: get from an overall flow /ef/tech/.ef-config/plist.json
         # (or get it from the currently selected project)
         #EFABLESS PLATFORM
-        for pdkdir_lr in glob.glob('PREFIX'+'/*/libs.tech/'):
+        for pdkdir_lr in glob.glob('PREFIX/*/libs.tech/'):
             pdkdir = os.path.split( os.path.split( pdkdir_lr )[0])[0]    # discard final .../libs.tech/
             (foundry, foundry_name, node, desc, status) = ProjectManager.pdkdir2fnd( pdkdir )
             if not foundry or not node: