Remove MCPClient/lib directory

artefactual · Oct 17, 2024 · 8f701c4 · 8f701c4
1 parent 9e76fdf
commit 8f701c4
Show file tree

Hide file tree

Showing 147 changed files with 13 additions and 15 deletions.
diff --git a/hack/Dockerfile b/hack/Dockerfile
@@ -224,17 +224,17 @@ COPY --chown=${USER_ID}:${GROUP_ID} --link . /src
 FROM base AS archivematica-mcp-client
 
 ENV DJANGO_SETTINGS_MODULE=settings.common
-ENV PYTHONPATH=/src/src/MCPClient/lib/:/src/src/MCPClient/lib/clientScripts:/src/src/archivematicaCommon/lib/:/src/src/dashboard/
-ENV ARCHIVEMATICA_MCPCLIENT_ARCHIVEMATICACLIENTMODULES=/src/src/MCPClient/lib/archivematicaClientModules
-ENV ARCHIVEMATICA_MCPCLIENT_CLIENTASSETSDIRECTORY=/src/src/MCPClient/lib/assets/
-ENV ARCHIVEMATICA_MCPCLIENT_CLIENTSCRIPTSDIRECTORY=/src/src/MCPClient/lib/clientScripts/
+ENV PYTHONPATH=/src/src/MCPClient/:/src/src/MCPClient/clientScripts:/src/src/archivematicaCommon/lib/:/src/src/dashboard/
+ENV ARCHIVEMATICA_MCPCLIENT_ARCHIVEMATICACLIENTMODULES=/src/src/MCPClient/archivematicaClientModules
+ENV ARCHIVEMATICA_MCPCLIENT_CLIENTASSETSDIRECTORY=/src/src/MCPClient/assets/
+ENV ARCHIVEMATICA_MCPCLIENT_CLIENTSCRIPTSDIRECTORY=/src/src/MCPClient/clientScripts/
 
 # Some scripts in archivematica-fpr-admin executed by MCPClient rely on certain
 # files being available in this image (e.g. see https://git.io/vA1wF).
 COPY --link src/archivematicaCommon/lib/externals/fido/ /usr/lib/archivematica/archivematicaCommon/externals/fido/
 COPY --link src/archivematicaCommon/lib/externals/fiwalk_plugins/ /usr/lib/archivematica/archivematicaCommon/externals/fiwalk_plugins/
 
-ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPClient/lib/archivematicaClient.py"]
+ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPClient/archivematicaClient.py"]
 
 # -----------------------------------------------------------------------------
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -17,8 +17,7 @@ omit = [
 include = [
     "**/src/archivematicaCommon/lib/*",
     "**/src/dashboard/*",
-    "**/src/MCPClient/lib/*",
-    "**/src/MCPClient/lib/clientScripts/*",
+    "**/src/MCPClient/*",
     "**/src/MCPServer/lib/*",
 ]
 branch = true
@@ -129,8 +128,7 @@ legacy_tox_ini = """
         MCPSERVER_DIR = {env:MCPSERVER_ROOT}/lib
         MCPSERVER_PYTHONPATH = {env:MCPSERVER_DIR}:{env:ARCHIVEMATICA_COMMON_DIR}:{env:DASHBOARD_DIR}
         # MCP Client
-        MCPCLIENT_ROOT = {env:SRC_DIR}/MCPClient
-        MCPCLIENT_DIR = {env:MCPCLIENT_ROOT}/lib
+        MCPCLIENT_DIR = {env:SRC_DIR}/MCPClient
         MCPCLIENT_PYTHONPATH = {env:MCPCLIENT_DIR}:{env:MCPCLIENT_DIR}/clientScripts:{env:ARCHIVEMATICA_COMMON_DIR}:{env:DASHBOARD_DIR}
         # Storage Service
         STORAGE_SERVICE_ROOT = {env:HACK_DIR}/submodules/archivematica-storage-service

diff --git a/src/MCPClient/lib/archivematicaClient.py → src/MCPClient/archivematicaClient.py b/src/MCPClient/lib/archivematicaClient.py → src/MCPClient/archivematicaClient.py
diff --git a/src/MCPClient/lib/archivematicaClientModules → src/MCPClient/archivematicaClientModules b/src/MCPClient/lib/archivematicaClientModules → src/MCPClient/archivematicaClientModules
diff --git a/src/MCPClient/lib/assets/README/README.html → src/MCPClient/assets/README/README.html b/src/MCPClient/lib/assets/README/README.html → src/MCPClient/assets/README/README.html
diff --git a/...nt/lib/assets/README/TRANSFER_README.html → ...Client/assets/README/TRANSFER_README.html b/...nt/lib/assets/README/TRANSFER_README.html → ...Client/assets/README/TRANSFER_README.html
diff --git a/src/MCPClient/lib/assets/catalog/catalog.xml → src/MCPClient/assets/catalog/catalog.xml b/src/MCPClient/lib/assets/catalog/catalog.xml → src/MCPClient/assets/catalog/catalog.xml
diff --git a/src/MCPClient/lib/assets/mets/mets.xsd → src/MCPClient/assets/mets/mets.xsd b/src/MCPClient/lib/assets/mets/mets.xsd → src/MCPClient/assets/mets/mets.xsd
diff --git a/src/MCPClient/lib/assets/mets/xlink.xsd → src/MCPClient/assets/mets/xlink.xsd b/src/MCPClient/lib/assets/mets/xlink.xsd → src/MCPClient/assets/mets/xlink.xsd
diff --git a/src/MCPClient/lib/assets/mods/mods.xsd → src/MCPClient/assets/mods/mods.xsd b/src/MCPClient/lib/assets/mods/mods.xsd → src/MCPClient/assets/mods/mods.xsd
diff --git a/src/MCPClient/lib/assets/mods/xml.xsd → src/MCPClient/assets/mods/xml.xsd b/src/MCPClient/lib/assets/mods/xml.xsd → src/MCPClient/assets/mods/xml.xsd
diff --git a/...PClient/lib/assets/premis/premis-v2-2.xsd → src/MCPClient/assets/premis/premis-v2-2.xsd b/...PClient/lib/assets/premis/premis-v2-2.xsd → src/MCPClient/assets/premis/premis-v2-2.xsd
diff --git a/src/MCPClient/lib/assets/premis/premis.xsd → src/MCPClient/assets/premis/premis.xsd b/src/MCPClient/lib/assets/premis/premis.xsd → src/MCPClient/assets/premis/premis.xsd
diff --git a/src/MCPClient/lib/client/__init__.py → src/MCPClient/client/__init__.py b/src/MCPClient/lib/client/__init__.py → src/MCPClient/client/__init__.py
diff --git a/src/MCPClient/lib/client/gearman.py → src/MCPClient/client/gearman.py b/src/MCPClient/lib/client/gearman.py → src/MCPClient/client/gearman.py
diff --git a/src/MCPClient/lib/client/job.py → src/MCPClient/client/job.py b/src/MCPClient/lib/client/job.py → src/MCPClient/client/job.py
diff --git a/src/MCPClient/lib/client/loader.py → src/MCPClient/client/loader.py b/src/MCPClient/lib/client/loader.py → src/MCPClient/client/loader.py
@@ -8,7 +8,7 @@
 
 def get_supported_modules(modules_file_path: str) -> Dict[str, str]:
     """Create and return the ``supported_modules`` dict by parsing the MCPClient
-    modules config file (typically MCPClient/lib/archivematicaClientModules).
+    modules config file (typically MCPClient/archivematicaClientModules).
     """
     supported_modules = {}
     supported_modules_config = RawConfigParser()

diff --git a/src/MCPClient/lib/client/mcp.py → src/MCPClient/client/mcp.py b/src/MCPClient/lib/client/mcp.py → src/MCPClient/client/mcp.py
diff --git a/src/MCPClient/lib/client/metrics.py → src/MCPClient/client/metrics.py b/src/MCPClient/lib/client/metrics.py → src/MCPClient/client/metrics.py
diff --git a/src/MCPClient/lib/client/pool.py → src/MCPClient/client/pool.py b/src/MCPClient/lib/client/pool.py → src/MCPClient/client/pool.py
diff --git a/src/MCPClient/lib/client/utils.py → src/MCPClient/client/utils.py b/src/MCPClient/lib/client/utils.py → src/MCPClient/client/utils.py
diff --git a/src/MCPClient/lib/client/worker.py → src/MCPClient/client/worker.py b/src/MCPClient/lib/client/worker.py → src/MCPClient/client/worker.py
diff --git a/src/MCPClient/lib/clientScripts/__init__.py → src/MCPClient/clientScripts/__init__.py b/src/MCPClient/lib/clientScripts/__init__.py → src/MCPClient/clientScripts/__init__.py
diff --git a/...pts/archivematicaCreateMETSMetadataCSV.py → ...pts/archivematicaCreateMETSMetadataCSV.py b/...pts/archivematicaCreateMETSMetadataCSV.py → ...pts/archivematicaCreateMETSMetadataCSV.py
diff --git a/...pts/archivematicaCreateMETSMetadataXML.py → ...pts/archivematicaCreateMETSMetadataXML.py b/...pts/archivematicaCreateMETSMetadataXML.py → ...pts/archivematicaCreateMETSMetadataXML.py
diff --git a/...cripts/archivematicaCreateMETSReingest.py → ...cripts/archivematicaCreateMETSReingest.py b/...cripts/archivematicaCreateMETSReingest.py → ...cripts/archivematicaCreateMETSReingest.py
diff --git a/...tScripts/archivematicaCreateMETSRights.py → ...tScripts/archivematicaCreateMETSRights.py b/...tScripts/archivematicaCreateMETSRights.py → ...tScripts/archivematicaCreateMETSRights.py
diff --git a/...chivematicaCreateMETSRightsDspaceMDRef.py → ...chivematicaCreateMETSRightsDspaceMDRef.py b/...chivematicaCreateMETSRightsDspaceMDRef.py → ...chivematicaCreateMETSRightsDspaceMDRef.py
diff --git a/...entScripts/archivematicaCreateMETSTrim.py → ...entScripts/archivematicaCreateMETSTrim.py b/...entScripts/archivematicaCreateMETSTrim.py → ...entScripts/archivematicaCreateMETSTrim.py
diff --git a/...b/clientScripts/archivematica_clamscan.py → ...t/clientScripts/archivematica_clamscan.py b/...b/clientScripts/archivematica_clamscan.py → ...t/clientScripts/archivematica_clamscan.py
diff --git a/...nt/lib/clientScripts/assign_file_uuids.py → ...Client/clientScripts/assign_file_uuids.py b/...nt/lib/clientScripts/assign_file_uuids.py → ...Client/clientScripts/assign_file_uuids.py
diff --git a/...entScripts/assign_uuids_to_directories.py → ...entScripts/assign_uuids_to_directories.py b/...entScripts/assign_uuids_to_directories.py → ...entScripts/assign_uuids_to_directories.py
diff --git a/...ientScripts/bag_with_empty_directories.py → ...ientScripts/bag_with_empty_directories.py b/...ientScripts/bag_with_empty_directories.py → ...ientScripts/bag_with_empty_directories.py
diff --git a/src/MCPClient/lib/clientScripts/bind_pid.py → src/MCPClient/clientScripts/bind_pid.py b/src/MCPClient/lib/clientScripts/bind_pid.py → src/MCPClient/clientScripts/bind_pid.py
diff --git a/src/MCPClient/lib/clientScripts/bind_pids.py → src/MCPClient/clientScripts/bind_pids.py b/src/MCPClient/lib/clientScripts/bind_pids.py → src/MCPClient/clientScripts/bind_pids.py
diff --git a/...PClient/lib/clientScripts/change_names.py → src/MCPClient/clientScripts/change_names.py b/...PClient/lib/clientScripts/change_names.py → src/MCPClient/clientScripts/change_names.py
diff --git a/.../lib/clientScripts/change_object_names.py → ...ient/clientScripts/change_object_names.py b/.../lib/clientScripts/change_object_names.py → ...ient/clientScripts/change_object_names.py
diff --git a/...ient/lib/clientScripts/change_sip_name.py → ...CPClient/clientScripts/change_sip_name.py b/...ient/lib/clientScripts/change_sip_name.py → ...CPClient/clientScripts/change_sip_name.py
diff --git a/...nt/lib/clientScripts/characterize_file.py → ...Client/clientScripts/characterize_file.py b/...nt/lib/clientScripts/characterize_file.py → ...Client/clientScripts/characterize_file.py
diff --git a/...ientScripts/check_for_access_directory.py → ...ientScripts/check_for_access_directory.py b/...ientScripts/check_for_access_directory.py → ...ientScripts/check_for_access_directory.py
diff --git a/...entScripts/check_for_service_directory.py → ...entScripts/check_for_service_directory.py b/...entScripts/check_for_service_directory.py → ...entScripts/check_for_service_directory.py
diff --git a/...pts/check_for_submission_documentation.py → ...pts/check_for_submission_documentation.py b/...pts/check_for_submission_documentation.py → ...pts/check_for_submission_documentation.py
diff --git a/...s/check_transfer_directory_for_objects.py → ...s/check_transfer_directory_for_objects.py b/...s/check_transfer_directory_for_objects.py → ...s/check_transfer_directory_for_objects.py
diff --git a/src/MCPClient/lib/clientScripts/cmd_chmod.py → src/MCPClient/clientScripts/cmd_chmod.py b/src/MCPClient/lib/clientScripts/cmd_chmod.py → src/MCPClient/clientScripts/cmd_chmod.py
diff --git a/src/MCPClient/lib/clientScripts/cmd_cp.py → src/MCPClient/clientScripts/cmd_cp.py b/src/MCPClient/lib/clientScripts/cmd_cp.py → src/MCPClient/clientScripts/cmd_cp.py
diff --git a/src/MCPClient/lib/clientScripts/cmd_mkdir.py → src/MCPClient/clientScripts/cmd_mkdir.py b/src/MCPClient/lib/clientScripts/cmd_mkdir.py → src/MCPClient/clientScripts/cmd_mkdir.py
diff --git a/src/MCPClient/lib/clientScripts/cmd_mv.py → src/MCPClient/clientScripts/cmd_mv.py b/src/MCPClient/lib/clientScripts/cmd_mv.py → src/MCPClient/clientScripts/cmd_mv.py
diff --git a/src/MCPClient/lib/clientScripts/cmd_test.py → src/MCPClient/clientScripts/cmd_test.py b/src/MCPClient/lib/clientScripts/cmd_test.py → src/MCPClient/clientScripts/cmd_test.py
diff --git a/src/MCPClient/lib/clientScripts/cmd_tree.py → src/MCPClient/clientScripts/cmd_tree.py b/src/MCPClient/lib/clientScripts/cmd_tree.py → src/MCPClient/clientScripts/cmd_tree.py
diff --git a/...PClient/lib/clientScripts/compress_aip.py → src/MCPClient/clientScripts/compress_aip.py b/...PClient/lib/clientScripts/compress_aip.py → src/MCPClient/clientScripts/compress_aip.py
diff --git a/...entScripts/convert_dataverse_structure.py → ...entScripts/convert_dataverse_structure.py b/...entScripts/convert_dataverse_structure.py → ...entScripts/convert_dataverse_structure.py
diff --git a/...ib/clientScripts/copyRecursiveIfExists.sh → ...nt/clientScripts/copyRecursiveIfExists.sh b/...ib/clientScripts/copyRecursiveIfExists.sh → ...nt/clientScripts/copyRecursiveIfExists.sh
diff --git a/...t/lib/clientScripts/copySubmissionDocs.sh → ...lient/clientScripts/copySubmissionDocs.sh b/...t/lib/clientScripts/copySubmissionDocs.sh → ...lient/clientScripts/copySubmissionDocs.sh
diff --git a/...lient/lib/clientScripts/copy_recursive.py → ...MCPClient/clientScripts/copy_recursive.py b/...lient/lib/clientScripts/copy_recursive.py → ...MCPClient/clientScripts/copy_recursive.py
diff --git a/...lib/clientScripts/copy_submission_docs.py → ...ent/clientScripts/copy_submission_docs.py b/...lib/clientScripts/copy_submission_docs.py → ...ent/clientScripts/copy_submission_docs.py
diff --git a/...ripts/copy_thumbnails_to_dip_directory.py → ...ripts/copy_thumbnails_to_dip_directory.py b/...ripts/copy_thumbnails_to_dip_directory.py → ...ripts/copy_thumbnails_to_dip_directory.py
diff --git a/...copy_transfer_submission_documentation.py → ...copy_transfer_submission_documentation.py b/...copy_transfer_submission_documentation.py → ...copy_transfer_submission_documentation.py
diff --git a/...ripts/copy_transfers_metadata_and_logs.py → ...ripts/copy_transfers_metadata_and_logs.py b/...ripts/copy_transfers_metadata_and_logs.py → ...ripts/copy_transfers_metadata_and_logs.py
diff --git a/...ient/lib/clientScripts/create_aic_mets.py → ...CPClient/clientScripts/create_aic_mets.py b/...ient/lib/clientScripts/create_aic_mets.py → ...CPClient/clientScripts/create_aic_mets.py
diff --git a/...PClient/lib/clientScripts/create_event.py → src/MCPClient/clientScripts/create_event.py b/...PClient/lib/clientScripts/create_event.py → src/MCPClient/clientScripts/create_event.py
diff --git a/...clientScripts/create_mets_dataverse_v2.py → ...clientScripts/create_mets_dataverse_v2.py b/...clientScripts/create_mets_dataverse_v2.py → ...clientScripts/create_mets_dataverse_v2.py
diff --git a/...lient/lib/clientScripts/create_mets_v2.py → ...MCPClient/clientScripts/create_mets_v2.py b/...lient/lib/clientScripts/create_mets_v2.py → ...MCPClient/clientScripts/create_mets_v2.py
diff --git a/...ripts/create_sip_from_transfer_objects.py → ...ripts/create_sip_from_transfer_objects.py b/...ripts/create_sip_from_transfer_objects.py → ...ripts/create_sip_from_transfer_objects.py
diff --git a/...ate_sips_from_trim_transfer_containers.py → ...ate_sips_from_trim_transfer_containers.py b/...ate_sips_from_trim_transfer_containers.py → ...ate_sips_from_trim_transfer_containers.py
diff --git a/...clientScripts/create_transfer_metadata.py → ...clientScripts/create_transfer_metadata.py b/...clientScripts/create_transfer_metadata.py → ...clientScripts/create_transfer_metadata.py
diff --git a/...lib/clientScripts/create_transfer_mets.py → ...ent/clientScripts/create_transfer_mets.py b/...lib/clientScripts/create_transfer_mets.py → ...ent/clientScripts/create_transfer_mets.py
diff --git a/...ts/determine_aip_version_key_exit_code.py → ...ts/determine_aip_version_key_exit_code.py b/...ts/determine_aip_version_key_exit_code.py → ...ts/determine_aip_version_key_exit_code.py
diff --git a/...ib/clientScripts/dip_generation_helper.py → ...nt/clientScripts/dip_generation_helper.py b/...ib/clientScripts/dip_generation_helper.py → ...nt/clientScripts/dip_generation_helper.py
diff --git a/...nt/lib/clientScripts/email_fail_report.py → ...Client/clientScripts/email_fail_report.py b/...nt/lib/clientScripts/email_fail_report.py → ...Client/clientScripts/email_fail_report.py
diff --git a/...ent/lib/clientScripts/examine_contents.py → ...PClient/clientScripts/examine_contents.py b/...ent/lib/clientScripts/examine_contents.py → ...PClient/clientScripts/examine_contents.py
diff --git a/...ent/lib/clientScripts/extract_contents.py → ...PClient/clientScripts/extract_contents.py b/...ent/lib/clientScripts/extract_contents.py → ...PClient/clientScripts/extract_contents.py
diff --git a/...entScripts/extract_maildir_attachments.py → ...entScripts/extract_maildir_attachments.py b/...entScripts/extract_maildir_attachments.py → ...entScripts/extract_maildir_attachments.py
diff --git a/.../clientScripts/extract_zipped_transfer.py → .../clientScripts/extract_zipped_transfer.py b/.../clientScripts/extract_zipped_transfer.py → .../clientScripts/extract_zipped_transfer.py
diff --git a/...t/lib/clientScripts/failed_sip_cleanup.py → ...lient/clientScripts/failed_sip_cleanup.py b/...t/lib/clientScripts/failed_sip_cleanup.py → ...lient/clientScripts/failed_sip_cleanup.py
diff --git a/.../clientScripts/failed_transfer_cleanup.py → .../clientScripts/failed_transfer_cleanup.py b/.../clientScripts/failed_transfer_cleanup.py → .../clientScripts/failed_transfer_cleanup.py
diff --git a/...lient/lib/clientScripts/file_to_folder.py → ...MCPClient/clientScripts/file_to_folder.py b/...lient/lib/clientScripts/file_to_folder.py → ...MCPClient/clientScripts/file_to_folder.py
diff --git a/...lientScripts/get_aip_storage_locations.py → ...lientScripts/get_aip_storage_locations.py b/...lientScripts/get_aip_storage_locations.py → ...lientScripts/get_aip_storage_locations.py
diff --git a/...PClient/lib/clientScripts/has_packages.py → src/MCPClient/clientScripts/has_packages.py b/...PClient/lib/clientScripts/has_packages.py → src/MCPClient/clientScripts/has_packages.py
diff --git a/...ib/clientScripts/identify_dspace_files.py → ...nt/clientScripts/identify_dspace_files.py b/...ib/clientScripts/identify_dspace_files.py → ...nt/clientScripts/identify_dspace_files.py
diff --git a/...ientScripts/identify_dspace_mets_files.py → ...ientScripts/identify_dspace_mets_files.py b/...ientScripts/identify_dspace_mets_files.py → ...ientScripts/identify_dspace_mets_files.py
diff --git a/...lib/clientScripts/identify_file_format.py → ...ent/clientScripts/identify_file_format.py b/...lib/clientScripts/identify_file_format.py → ...ent/clientScripts/identify_file_format.py
diff --git a/src/MCPClient/lib/clientScripts/index_aip.py → src/MCPClient/clientScripts/index_aip.py b/src/MCPClient/lib/clientScripts/index_aip.py → src/MCPClient/clientScripts/index_aip.py
diff --git a/...lient/lib/clientScripts/is_maildir_aip.py → ...MCPClient/clientScripts/is_maildir_aip.py b/...lient/lib/clientScripts/is_maildir_aip.py → ...MCPClient/clientScripts/is_maildir_aip.py
diff --git a/...lib/clientScripts/json_metadata_to_csv.py → ...ent/clientScripts/json_metadata_to_csv.py b/...lib/clientScripts/json_metadata_to_csv.py → ...ent/clientScripts/json_metadata_to_csv.py
diff --git a/...PClient/lib/clientScripts/lib/__init__.py → src/MCPClient/clientScripts/lib/__init__.py b/...PClient/lib/clientScripts/lib/__init__.py → src/MCPClient/clientScripts/lib/__init__.py
diff --git a/...ent/lib/clientScripts/load_dublin_core.py → ...PClient/clientScripts/load_dublin_core.py b/...ent/lib/clientScripts/load_dublin_core.py → ...PClient/clientScripts/load_dublin_core.py
diff --git a/...lib/clientScripts/load_labels_from_csv.py → ...ent/clientScripts/load_labels_from_csv.py b/...lib/clientScripts/load_labels_from_csv.py → ...ent/clientScripts/load_labels_from_csv.py
diff --git a/...entScripts/load_premis_events_from_xml.py → ...entScripts/load_premis_events_from_xml.py b/...entScripts/load_premis_events_from_xml.py → ...entScripts/load_premis_events_from_xml.py
diff --git a/...eck_for_manual_normalization_directory.py → ...eck_for_manual_normalization_directory.py b/...eck_for_manual_normalization_directory.py → ...eck_for_manual_normalization_directory.py
diff --git a/...zation_create_metadata_and_restructure.py → ...zation_create_metadata_and_restructure.py b/...zation_create_metadata_and_restructure.py → ...zation_create_metadata_and_restructure.py
diff --git a/..._normalization_identify_files_included.py → ..._normalization_identify_files_included.py b/..._normalization_identify_files_included.py → ..._normalization_identify_files_included.py
diff --git a/...normalization_move_access_files_to_dip.py → ...normalization_move_access_files_to_dip.py b/...normalization_move_access_files_to_dip.py → ...normalization_move_access_files_to_dip.py
diff --git a/...al_normalization_remove_mn_directories.py → ...al_normalization_remove_mn_directories.py b/...al_normalization_remove_mn_directories.py → ...al_normalization_remove_mn_directories.py
diff --git a/...Client/lib/clientScripts/move_or_merge.py → src/MCPClient/clientScripts/move_or_merge.py b/...Client/lib/clientScripts/move_or_merge.py → src/MCPClient/clientScripts/move_or_merge.py
diff --git a/src/MCPClient/lib/clientScripts/move_sip.py → src/MCPClient/clientScripts/move_sip.py b/src/MCPClient/lib/clientScripts/move_sip.py → src/MCPClient/clientScripts/move_sip.py
diff --git a/...ient/lib/clientScripts/move_to_backlog.py → ...CPClient/clientScripts/move_to_backlog.py b/...ient/lib/clientScripts/move_to_backlog.py → ...CPClient/clientScripts/move_to_backlog.py
diff --git a/...Client/lib/clientScripts/move_transfer.py → src/MCPClient/clientScripts/move_transfer.py b/...Client/lib/clientScripts/move_transfer.py → src/MCPClient/clientScripts/move_transfer.py
diff --git a/src/MCPClient/lib/clientScripts/normalize.py → src/MCPClient/clientScripts/normalize.py b/src/MCPClient/lib/clientScripts/normalize.py → src/MCPClient/clientScripts/normalize.py
diff --git a/...ent/lib/clientScripts/normalize_report.py → ...PClient/clientScripts/normalize_report.py b/...ent/lib/clientScripts/normalize_report.py → ...PClient/clientScripts/normalize_report.py
diff --git a/...lib/clientScripts/parse_dataverse_mets.py → ...ent/clientScripts/parse_dataverse_mets.py b/...lib/clientScripts/parse_dataverse_mets.py → ...ent/clientScripts/parse_dataverse_mets.py
diff --git a/.../lib/clientScripts/parse_external_mets.py → ...ient/clientScripts/parse_external_mets.py b/.../lib/clientScripts/parse_external_mets.py → ...ient/clientScripts/parse_external_mets.py
diff --git a/...ent/lib/clientScripts/parse_mets_to_db.py → ...PClient/clientScripts/parse_mets_to_db.py b/...ent/lib/clientScripts/parse_mets_to_db.py → ...PClient/clientScripts/parse_mets_to_db.py
diff --git a/...ient/lib/clientScripts/pid_declaration.py → ...CPClient/clientScripts/pid_declaration.py b/...ient/lib/clientScripts/pid_declaration.py → ...CPClient/clientScripts/pid_declaration.py
diff --git a/...PClient/lib/clientScripts/policy_check.py → src/MCPClient/clientScripts/policy_check.py b/...PClient/lib/clientScripts/policy_check.py → src/MCPClient/clientScripts/policy_check.py
diff --git a/.../lib/clientScripts/post_store_aip_hook.py → ...ient/clientScripts/post_store_aip_hook.py b/.../lib/clientScripts/post_store_aip_hook.py → ...ient/clientScripts/post_store_aip_hook.py
diff --git a/...t/lib/clientScripts/remove_directories.py → ...lient/clientScripts/remove_directories.py b/...t/lib/clientScripts/remove_directories.py → ...lient/clientScripts/remove_directories.py
diff --git a/...s/remove_files_without_premis_metadata.py → ...s/remove_files_without_premis_metadata.py b/...s/remove_files_without_premis_metadata.py → ...s/remove_files_without_premis_metadata.py
diff --git a/...ts/remove_hidden_files_and_directories.py → ...ts/remove_hidden_files_and_directories.py b/...ts/remove_hidden_files_and_directories.py → ...ts/remove_hidden_files_and_directories.py
diff --git a/...ib/clientScripts/remove_unneeded_files.py → ...nt/clientScripts/remove_unneeded_files.py b/...ib/clientScripts/remove_unneeded_files.py → ...nt/clientScripts/remove_unneeded_files.py
diff --git a/...ientScripts/restructure_bag_aip_to_sip.py → ...ientScripts/restructure_bag_aip_to_sip.py b/...ientScripts/restructure_bag_aip_to_sip.py → ...ientScripts/restructure_bag_aip_to_sip.py
diff --git a/.../restructure_dip_for_content_dm_upload.py → .../restructure_dip_for_content_dm_upload.py b/.../restructure_dip_for_content_dm_upload.py → .../restructure_dip_for_content_dm_upload.py
diff --git a/...ientScripts/restructure_for_compliance.py → ...ientScripts/restructure_for_compliance.py b/...ientScripts/restructure_for_compliance.py → ...ientScripts/restructure_for_compliance.py
diff --git a/...pts/restructure_for_compliance_maildir.py → ...pts/restructure_for_compliance_maildir.py b/...pts/restructure_for_compliance_maildir.py → ...pts/restructure_for_compliance_maildir.py
diff --git a/...Scripts/restructure_for_compliance_sip.py → ...Scripts/restructure_for_compliance_sip.py b/...Scripts/restructure_for_compliance_sip.py → ...Scripts/restructure_for_compliance_sip.py
diff --git a/...ipts/retry_normalize_remove_normalized.py → ...ipts/retry_normalize_remove_normalized.py b/...ipts/retry_normalize_remove_normalized.py → ...ipts/retry_normalize_remove_normalized.py
diff --git a/...ient/lib/clientScripts/rights_from_csv.py → ...CPClient/clientScripts/rights_from_csv.py b/...ient/lib/clientScripts/rights_from_csv.py → ...CPClient/clientScripts/rights_from_csv.py
diff --git a/...ent/lib/clientScripts/save_dublin_core.py → ...PClient/clientScripts/save_dublin_core.py b/...ent/lib/clientScripts/save_dublin_core.py → ...PClient/clientScripts/save_dublin_core.py
diff --git a/.../set_maildir_file_grp_use_and_file_ids.py → .../set_maildir_file_grp_use_and_file_ids.py b/.../set_maildir_file_grp_use_and_file_ids.py → .../set_maildir_file_grp_use_and_file_ids.py
diff --git a/...nt/lib/clientScripts/set_transfer_type.py → ...Client/clientScripts/set_transfer_type.py b/...nt/lib/clientScripts/set_transfer_type.py → ...Client/clientScripts/set_transfer_type.py
diff --git a/src/MCPClient/lib/clientScripts/store_aip.py → src/MCPClient/clientScripts/store_aip.py b/src/MCPClient/lib/clientScripts/store_aip.py → src/MCPClient/clientScripts/store_aip.py
diff --git a/...tScripts/store_file_modification_dates.py → ...tScripts/store_file_modification_dates.py b/...tScripts/store_file_modification_dates.py → ...tScripts/store_file_modification_dates.py
diff --git a/...MCPClient/lib/clientScripts/transcoder.py → src/MCPClient/clientScripts/transcoder.py b/...MCPClient/lib/clientScripts/transcoder.py → src/MCPClient/clientScripts/transcoder.py
diff --git a/...ient/lib/clientScripts/transcribe_file.py → ...CPClient/clientScripts/transcribe_file.py b/...ient/lib/clientScripts/transcribe_file.py → ...CPClient/clientScripts/transcribe_file.py
diff --git a/...ientScripts/trim_create_rights_entries.py → ...ientScripts/trim_create_rights_entries.py b/...ientScripts/trim_create_rights_entries.py → ...ientScripts/trim_create_rights_entries.py
diff --git a/...cripts/trim_restructure_for_compliance.py → ...cripts/trim_restructure_for_compliance.py b/...cripts/trim_restructure_for_compliance.py → ...cripts/trim_restructure_for_compliance.py
diff --git a/...ib/clientScripts/trim_verify_checksums.py → ...nt/clientScripts/trim_verify_checksums.py b/...ib/clientScripts/trim_verify_checksums.py → ...nt/clientScripts/trim_verify_checksums.py
diff --git a/...lib/clientScripts/trim_verify_manifest.py → ...ent/clientScripts/trim_verify_manifest.py b/...lib/clientScripts/trim_verify_manifest.py → ...ent/clientScripts/trim_verify_manifest.py
diff --git a/...clientScripts/update_size_and_checksum.py → ...clientScripts/update_size_and_checksum.py b/...clientScripts/update_size_and_checksum.py → ...clientScripts/update_size_and_checksum.py
diff --git a/...lib/clientScripts/upload_archivesspace.py → ...ent/clientScripts/upload_archivesspace.py b/...lib/clientScripts/upload_archivesspace.py → ...ent/clientScripts/upload_archivesspace.py
diff --git a/...PClient/lib/clientScripts/upload_qubit.py → src/MCPClient/clientScripts/upload_qubit.py b/...PClient/lib/clientScripts/upload_qubit.py → src/MCPClient/clientScripts/upload_qubit.py
diff --git a/...Client/lib/clientScripts/validate_file.py → src/MCPClient/clientScripts/validate_file.py b/...Client/lib/clientScripts/validate_file.py → src/MCPClient/clientScripts/validate_file.py
diff --git a/...MCPClient/lib/clientScripts/verify_aip.py → src/MCPClient/clientScripts/verify_aip.py b/...MCPClient/lib/clientScripts/verify_aip.py → src/MCPClient/clientScripts/verify_aip.py
diff --git a/...ts/verify_and_restructure_transfer_bag.py → ...ts/verify_and_restructure_transfer_bag.py b/...ts/verify_and_restructure_transfer_bag.py → ...ts/verify_and_restructure_transfer_bag.py
diff --git a/...ient/lib/clientScripts/verify_checksum.py → ...CPClient/clientScripts/verify_checksum.py b/...ient/lib/clientScripts/verify_checksum.py → ...CPClient/clientScripts/verify_checksum.py
diff --git a/...ksums_in_file_sec_of_dspace_mets_files.py → ...ksums_in_file_sec_of_dspace_mets_files.py b/...ksums_in_file_sec_of_dspace_mets_files.py → ...ksums_in_file_sec_of_dspace_mets_files.py
diff --git a/...CPClient/lib/clientScripts/verify_mets.py → src/MCPClient/clientScripts/verify_mets.py b/...CPClient/lib/clientScripts/verify_mets.py → src/MCPClient/clientScripts/verify_mets.py
diff --git a/...ib/clientScripts/verify_sip_compliance.py → ...nt/clientScripts/verify_sip_compliance.py b/...ib/clientScripts/verify_sip_compliance.py → ...nt/clientScripts/verify_sip_compliance.py
diff --git a/...ientScripts/verify_transfer_compliance.py → ...ientScripts/verify_transfer_compliance.py b/...ientScripts/verify_transfer_compliance.py → ...ientScripts/verify_transfer_compliance.py
diff --git a/src/MCPClient/lib/settings/__init__.py → src/MCPClient/settings/__init__.py b/src/MCPClient/lib/settings/__init__.py → src/MCPClient/settings/__init__.py
diff --git a/src/MCPClient/lib/settings/common.py → src/MCPClient/settings/common.py b/src/MCPClient/lib/settings/common.py → src/MCPClient/settings/common.py
diff --git a/src/MCPClient/lib/settings/test.py → src/MCPClient/settings/test.py b/src/MCPClient/lib/settings/test.py → src/MCPClient/settings/test.py
diff --git a/src/MCPClient/lib/settings/testmysql.py → src/MCPClient/settings/testmysql.py b/src/MCPClient/lib/settings/testmysql.py → src/MCPClient/settings/testmysql.py
diff --git a/src/archivematicaCommon/lib/appconfig.py b/src/archivematicaCommon/lib/appconfig.py
@@ -1,7 +1,7 @@
 """
 Configuration helper for MCPServer, MCPClient and Dashboard, used in:
 
-    - MCPClient/lib/settings/common.py
+    - MCPClient/settings/common.py
     - MCPServer/lib/settings/common.py
     - dashboard/settings/base.py
 

diff --git a/src/archivematicaCommon/lib/identifier_functions.py b/src/archivematicaCommon/lib/identifier_functions.py
@@ -1,7 +1,7 @@
 """
 Functions to fetch identifiers for indexing in ElasticSearch.
 
-See also src/MCPClient/lib/clientScripts/index_aip.py where these are used.
+See also src/MCPClient/clientScripts/index_aip.py where these are used.
 """
 
 from lxml import etree

diff --git a/tests/MCPClient/test_create_aip_mets.py b/tests/MCPClient/test_create_aip_mets.py
@@ -754,7 +754,7 @@ class TestCustomStructMap(TestCase):
     ]
     fixtures = [os.path.join(THIS_DIR, "fixtures", p) for p in fixture_files]
     mets_xsd_path = os.path.abspath(
-        os.path.join(THIS_DIR, "../../src/MCPClient/lib/assets/mets/mets.xsd")
+        os.path.join(THIS_DIR, "../../src/MCPClient/assets/mets/mets.xsd")
     )
 
     @pytest.fixture(autouse=True)

diff --git a/tests/MCPClient/test_load_premis_events_from_xml.py b/tests/MCPClient/test_load_premis_events_from_xml.py
@@ -16,7 +16,7 @@
 @pytest.fixture()
 def xsd_path():
     return os.path.abspath(
-        os.path.join(THIS_DIR, "../../src/MCPClient/lib/assets/premis/premis.xsd")
+        os.path.join(THIS_DIR, "../../src/MCPClient/assets/premis/premis.xsd")
     )
 
 

diff --git a/tests/MCPClient/upload-qubit-test b/tests/MCPClient/upload-qubit-test
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # upload-qubit script location
-UPLOAD_QUBIT_PATH="${HOME}/archivematica/src/MCPClient/lib/clientScripts/upload-qubit.py"
+UPLOAD_QUBIT_PATH="${HOME}/archivematica/src/MCPClient/clientScripts/upload-qubit.py"
 
 # Qubit URL and login
 URL="http://localhost/ica-atom/index.php/sword/deposit/archivematica"