Index: openmolcas/CMakeLists.txt
===================================================================
--- openmolcas.orig/CMakeLists.txt
+++ openmolcas/CMakeLists.txt
@@ -3263,19 +3263,19 @@ install (FILES
   ${PROJECT_BINARY_DIR}/molcas.rte
   ${PROJECT_BINARY_DIR}/LICENSE
   ${PROJECT_BINARY_DIR}/CONTRIBUTORS.md
-  DESTINATION ${CMAKE_INSTALL_PREFIX}
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openmolcas
 )
 
 install (DIRECTORY
   ${PROJECT_BINARY_DIR}/basis_library
   ${PROJECT_BINARY_DIR}/data
-  DESTINATION ${CMAKE_INSTALL_PREFIX}
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openmolcas
 )
 
 install (TARGETS
   ${PROGRAM_EXECUTABLES}
   ${MOLCAS_LIBRARIES}
-  RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+  RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/openmolcas
   LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
   ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 )
@@ -3283,17 +3283,15 @@ install (TARGETS
 install (PROGRAMS
   ${PROJECT_BINARY_DIR}/sbin/help_basis
   ${PROJECT_BINARY_DIR}/sbin/help_doc
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/sbin
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 )
 
 if (DEFINED PYMOLCAS_TARGET)
   install (PROGRAMS
     ${PYMOLCAS_TARGET}
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/sbin
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
     RENAME pymolcas
   )
-
-  install (CODE "execute_process(COMMAND ${OPENMOLCAS_DIR}/sbin/install_pymolcas.sh ${PYMOLCAS_TARGET})")
 endif ()
 
 install (DIRECTORY
@@ -3321,8 +3319,6 @@ if (DEFINED EXTRA_DIR)
     ${PROJECT_BINARY_DIR}/bin/molcas.exe
     DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
   )
-
-  install (CODE "execute_process(COMMAND ${OPENMOLCAS_DIR}/sbin/install_driver.sh ${MOLCAS_DRIVER})")
 endif ()
 
 # Additional directories to install (from external projects)
Index: openmolcas/Tools/pymolcas/CMakeLists.txt
===================================================================
--- openmolcas.orig/Tools/pymolcas/CMakeLists.txt
+++ openmolcas/Tools/pymolcas/CMakeLists.txt
@@ -52,8 +52,3 @@ COMMAND ${PYTHON_EXECUTABLE} export.py $
 add_custom_target (pymolcas ALL
         DEPENDS ${PYMOLCAS_TARGET}
         )
-
-add_custom_command (TARGET pymolcas
-POST_BUILD
-        COMMAND ${OPENMOLCAS_DIR}/sbin/install_pymolcas.sh ${PYMOLCAS_TARGET}
-        )
