multiple module utils: flatten directories (#11974)

* multiple module utils: flatten directories * adjust pritunl tests * adjust lxca and keycloak tests * adjust botmeta * rename test files correctly * and an import fix * rename pritunl api mod utils test * fix typo in test filename * rename references to pritunl api test * rename keycloak mod utils test
2026-05-06 13:22:48 +00:00 · 2026-05-06 17:07:51 +12:00
parent fb0541defb
commit 1047f45bec
84 changed files with 116 additions and 114 deletions
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -347,10 +347,14 @@ files:
    maintainers: russoz
  $module_utils/_cmd_runner.py:
    maintainers: russoz
+  $module_utils/_crypt.py:
+    maintainers: russoz
  $module_utils/_deps.py:
    maintainers: russoz
  $module_utils/_django.py:
    maintainers: russoz
+  $module_utils/_emc_vnx.py:
+    maintainers: russoz
  $module_utils/_gconftool2.py:
    labels: gconftool2
    maintainers: russoz
@@ -361,26 +365,30 @@ files:
    labels: gitlab
    maintainers: $team_gitlab
    notify: jlozadad
+  $module_utils/_hpe3par.py:
+    maintainers: farhan7500 gautamphegde
  $module_utils/_hwc_utils.py:
    keywords: cloud huawei hwc
    labels: huawei hwc_utils networking
    maintainers: $team_huawei
  $module_utils/_icinga2.py:
    maintainers: cfiehe
-  $module_utils/_identity/keycloak/keycloak.py:
-    maintainers: $team_keycloak
-  $module_utils/_identity/keycloak/keycloak_clientsecret.py:
-    maintainers: $team_keycloak fynncfchen johncant
  $module_utils/_ipa.py:
    labels: ipa
    maintainers: $team_ipa
  $module_utils/_jenkins.py:
    labels: jenkins
    maintainers: russoz
-  $module_utils/_crypt.py:
-    maintainers: russoz
+  $module_utils/_keycloak_clientsecret.py:
+    maintainers: $team_keycloak fynncfchen johncant
+  $module_utils/_keycloak_utils.py:
+    maintainers: $team_keycloak
+  $module_utils/_keycloak.py:
+    maintainers: $team_keycloak
  $module_utils/_lxc.py:
    maintainers: russoz
+  $module_utils/_lxca_common.py:
+    maintainers: navalkp prabhosa
  $module_utils/_lvm.py:
    labels: lvm
    maintainers: russoz
@@ -395,7 +403,7 @@ files:
  $module_utils/_module_helper.py:
    labels: module_helper
    maintainers: russoz
-  $module_utils/_net_tools/pritunl/:
+  $module_utils/_pritunl_api.py:
    maintainers: Lowess
  $module_utils/_pacemaker.py:
    maintainers: munchtoast
@@ -412,8 +420,6 @@ files:
  $module_utils/_redfish_utils.py:
    labels: redfish_utils
    maintainers: $team_redfish
-  $module_utils/_remote_management/lxca/common.py:
-    maintainers: navalkp prabhosa
  $module_utils/_scaleway.py:
    labels: cloud scaleway
    maintainers: $team_scaleway
@@ -424,8 +430,6 @@ files:
    maintainers: russoz
  $module_utils/_systemd.py:
    maintainers: NomakCooper
-  $module_utils/_storage/hpe3par/hpe3par.py:
-    maintainers: farhan7500 gautamphegde
  $module_utils/_utm_utils.py:
    labels: utm_utils
    maintainers: $team_e_spirit
--- a/plugins/module_utils/_source_control/bitbucket.py
+++ b/plugins/module_utils/_source_control/bitbucket.py
--- a/plugins/module_utils/_storage/emc/emc_vnx.py
+++ b/plugins/module_utils/_storage/emc/emc_vnx.py
--- a/plugins/module_utils/_storage/hpe3par/hpe3par.py
+++ b/plugins/module_utils/_storage/hpe3par/hpe3par.py
--- a/plugins/module_utils/_identity/keycloak/keycloak.py
+++ b/plugins/module_utils/_identity/keycloak/keycloak.py
--- a/plugins/module_utils/_identity/keycloak/keycloak_clientsecret.py
+++ b/plugins/module_utils/_identity/keycloak/keycloak_clientsecret.py
@@ -12,7 +12,7 @@ import typing as t

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    keycloak_argument_spec,
 )
--- a/plugins/module_utils/_identity/keycloak/_keycloak_utils.py
+++ b/plugins/module_utils/_identity/keycloak/_keycloak_utils.py
--- a/plugins/module_utils/_remote_management/lxca/common.py
+++ b/plugins/module_utils/_remote_management/lxca/common.py
--- a/plugins/module_utils/_net_tools/pritunl/api.py
+++ b/plugins/module_utils/_net_tools/pritunl/api.py
--- a/plugins/modules/bitbucket_access_key.py
+++ b/plugins/modules/bitbucket_access_key.py
@@ -74,7 +74,7 @@ RETURN = r""" # """

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper

 error_messages = {
    "required_key": "`key` is required when the `state` is `present`",
--- a/plugins/modules/bitbucket_pipeline_key_pair.py
+++ b/plugins/modules/bitbucket_pipeline_key_pair.py
@@ -71,7 +71,7 @@ RETURN = r""" # """

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper

 error_messages = {
    "invalid_params": "Account, repository or SSH key pair was not found",
--- a/plugins/modules/bitbucket_pipeline_known_host.py
+++ b/plugins/modules/bitbucket_pipeline_known_host.py
@@ -95,7 +95,7 @@ except ImportError:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper

 error_messages = {
    "invalid_params": "Account or repository was not found",
--- a/plugins/modules/bitbucket_pipeline_variable.py
+++ b/plugins/modules/bitbucket_pipeline_variable.py
@@ -83,7 +83,7 @@ RETURN = r""" # """

 from ansible.module_utils.basic import AnsibleModule, _load_params

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper

 error_messages = {
    "required_value": "`value` is required when the `state` is `present`",
--- a/plugins/modules/emc_vnx_sg_member.py
+++ b/plugins/modules/emc_vnx_sg_member.py
@@ -82,7 +82,7 @@ import traceback

 from ansible.module_utils.basic import AnsibleModule, missing_required_lib

-from ansible_collections.community.general.plugins.module_utils._storage.emc.emc_vnx import emc_vnx_argument_spec
+from ansible_collections.community.general.plugins.module_utils._emc_vnx import emc_vnx_argument_spec

 LIB_IMP_ERR = None
 try:
--- a/plugins/modules/keycloak_authentication.py
+++ b/plugins/modules/keycloak_authentication.py
@@ -228,7 +228,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_authentication_required_actions.py
+++ b/plugins/modules/keycloak_authentication_required_actions.py
@@ -174,7 +174,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_authentication_v2.py
+++ b/plugins/modules/keycloak_authentication_v2.py
@@ -372,7 +372,7 @@ import typing as t

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_authz_authorization_scope.py
+++ b/plugins/modules/keycloak_authz_authorization_scope.py
@@ -123,7 +123,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_authz_custom_policy.py
+++ b/plugins/modules/keycloak_authz_custom_policy.py
@@ -112,7 +112,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_authz_permission.py
+++ b/plugins/modules/keycloak_authz_permission.py
@@ -215,7 +215,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_authz_permission_info.py
+++ b/plugins/modules/keycloak_authz_permission_info.py
@@ -110,7 +110,7 @@ queried_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_client.py
+++ b/plugins/modules/keycloak_client.py
@@ -769,16 +769,16 @@ import copy

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak._keycloak_utils import (
-    merge_settings_without_absent_nulls,
-)
-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
    get_token,
    keycloak_argument_spec,
 )
+from ansible_collections.community.general.plugins.module_utils._keycloak_utils import (
+    merge_settings_without_absent_nulls,
+)

 PROTOCOL_OPENID_CONNECT = "openid-connect"
 PROTOCOL_SAML = "saml"
--- a/plugins/modules/keycloak_client_rolemapping.py
+++ b/plugins/modules/keycloak_client_rolemapping.py
@@ -240,7 +240,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_client_rolescope.py
+++ b/plugins/modules/keycloak_client_rolescope.py
@@ -149,7 +149,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_clientscope.py
+++ b/plugins/modules/keycloak_clientscope.py
@@ -290,7 +290,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
--- a/plugins/modules/keycloak_clientscope_type.py
+++ b/plugins/modules/keycloak_clientscope_type.py
@@ -137,7 +137,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_clientsecret_info.py
+++ b/plugins/modules/keycloak_clientsecret_info.py
@@ -126,12 +126,12 @@ clientsecret_info:
      sample: cUGnX1EIeTtPPAkcyGMv0ncyqDPu68P1
 """

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
 )
-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak_clientsecret import (
+from ansible_collections.community.general.plugins.module_utils._keycloak_clientsecret import (
    keycloak_clientsecret_module,
    keycloak_clientsecret_module_resolve_params,
 )
--- a/plugins/modules/keycloak_clientsecret_regenerate.py
+++ b/plugins/modules/keycloak_clientsecret_regenerate.py
@@ -129,12 +129,12 @@ end_state:
      sample: cUGnX1EIeTtPPAkcyGMv0ncyqDPu68P1
 """

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
 )
-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak_clientsecret import (
+from ansible_collections.community.general.plugins.module_utils._keycloak_clientsecret import (
    keycloak_clientsecret_module,
    keycloak_clientsecret_module_resolve_params,
 )
--- a/plugins/modules/keycloak_clienttemplate.py
+++ b/plugins/modules/keycloak_clienttemplate.py
@@ -267,7 +267,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
--- a/plugins/modules/keycloak_component.py
+++ b/plugins/modules/keycloak_component.py
@@ -133,7 +133,7 @@ from urllib.parse import urlencode

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
--- a/plugins/modules/keycloak_component_info.py
+++ b/plugins/modules/keycloak_component_info.py
@@ -103,7 +103,7 @@ from urllib.parse import quote

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_group.py
+++ b/plugins/modules/keycloak_group.py
@@ -299,7 +299,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
--- a/plugins/modules/keycloak_identity_provider.py
+++ b/plugins/modules/keycloak_identity_provider.py
@@ -487,7 +487,7 @@ from copy import deepcopy

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
--- a/plugins/modules/keycloak_realm.py
+++ b/plugins/modules/keycloak_realm.py
@@ -825,7 +825,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
--- a/plugins/modules/keycloak_realm_info.py
+++ b/plugins/modules/keycloak_realm_info.py
@@ -97,7 +97,7 @@ realm_info:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import KeycloakAPI
+from ansible_collections.community.general.plugins.module_utils._keycloak import KeycloakAPI


 def main():
--- a/plugins/modules/keycloak_realm_key.py
+++ b/plugins/modules/keycloak_realm_key.py
@@ -547,7 +547,7 @@ from urllib.parse import urlencode

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
--- a/plugins/modules/keycloak_realm_keys_metadata_info.py
+++ b/plugins/modules/keycloak_realm_keys_metadata_info.py
@@ -87,7 +87,7 @@ keys_metadata:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_realm_localization.py
+++ b/plugins/modules/keycloak_realm_localization.py
@@ -198,7 +198,7 @@ from copy import deepcopy

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_realm_rolemapping.py
+++ b/plugins/modules/keycloak_realm_rolemapping.py
@@ -225,7 +225,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_role.py
+++ b/plugins/modules/keycloak_role.py
@@ -229,7 +229,7 @@ import copy

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
--- a/plugins/modules/keycloak_user.py
+++ b/plugins/modules/keycloak_user.py
@@ -343,7 +343,7 @@ import copy

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
--- a/plugins/modules/keycloak_user_execute_actions_email.py
+++ b/plugins/modules/keycloak_user_execute_actions_email.py
@@ -126,7 +126,7 @@ actions:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_user_federation.py
+++ b/plugins/modules/keycloak_user_federation.py
@@ -723,7 +723,7 @@ from urllib.parse import urlencode

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
--- a/plugins/modules/keycloak_user_rolemapping.py
+++ b/plugins/modules/keycloak_user_rolemapping.py
@@ -241,7 +241,7 @@ end_state:

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    get_token,
--- a/plugins/modules/keycloak_userprofile.py
+++ b/plugins/modules/keycloak_userprofile.py
@@ -480,7 +480,7 @@ from urllib.parse import urlencode

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakAPI,
    KeycloakError,
    camel,
--- a/plugins/modules/lxca_cmms.py
+++ b/plugins/modules/lxca_cmms.py
@@ -93,7 +93,7 @@ import traceback

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common import (
+from ansible_collections.community.general.plugins.module_utils._lxca_common import (
    LXCA_COMMON_ARGS,
    connection_object,
    has_pylxca,
--- a/plugins/modules/lxca_nodes.py
+++ b/plugins/modules/lxca_nodes.py
@@ -112,7 +112,7 @@ import traceback

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common import (
+from ansible_collections.community.general.plugins.module_utils._lxca_common import (
    LXCA_COMMON_ARGS,
    connection_object,
    has_pylxca,
--- a/plugins/modules/pritunl_org.py
+++ b/plugins/modules/pritunl_org.py
@@ -78,7 +78,7 @@ response:
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.common.dict_transformations import dict_merge

-from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import (
+from ansible_collections.community.general.plugins.module_utils._pritunl_api import (
    PritunlException,
    delete_pritunl_organization,
    get_pritunl_settings,
--- a/plugins/modules/pritunl_org_info.py
+++ b/plugins/modules/pritunl_org_info.py
@@ -73,7 +73,7 @@ organizations:
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.common.dict_transformations import dict_merge

-from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import (
+from ansible_collections.community.general.plugins.module_utils._pritunl_api import (
    PritunlException,
    get_pritunl_settings,
    list_pritunl_organizations,
--- a/plugins/modules/pritunl_user.py
+++ b/plugins/modules/pritunl_user.py
@@ -143,7 +143,7 @@ response:
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.common.dict_transformations import dict_merge

-from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import (
+from ansible_collections.community.general.plugins.module_utils._pritunl_api import (
    PritunlException,
    delete_pritunl_user,
    get_pritunl_settings,
--- a/plugins/modules/pritunl_user_info.py
+++ b/plugins/modules/pritunl_user_info.py
@@ -91,7 +91,7 @@ users:
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.common.dict_transformations import dict_merge

-from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import (
+from ansible_collections.community.general.plugins.module_utils._pritunl_api import (
    PritunlException,
    get_pritunl_settings,
    list_pritunl_organizations,
--- a/plugins/modules/ss_3par_cpg.py
+++ b/plugins/modules/ss_3par_cpg.py
@@ -123,7 +123,7 @@ RETURN = r"""

 from ansible.module_utils.basic import AnsibleModule

-from ansible_collections.community.general.plugins.module_utils._storage.hpe3par import hpe3par
+from ansible_collections.community.general.plugins.module_utils import _hpe3par as hpe3par

 try:
    from hpe3par_sdk import client
--- a/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_module_utils.py
+++ b/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_module_utils.py
@@ -6,7 +6,7 @@ from __future__ import annotations

 import unittest

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import is_struct_included
+from ansible_collections.community.general.plugins.module_utils._keycloak import is_struct_included


 class KeycloakIsStructIncludedTestCase(unittest.TestCase):
--- a/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_connect.py
+++ b/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_connect.py
@@ -10,7 +10,7 @@ from urllib.error import HTTPError

 import pytest

-from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
+from ansible_collections.community.general.plugins.module_utils._keycloak import (
    KeycloakError,
    get_token,
 )
@@ -70,7 +70,7 @@ def mock_good_connection(mocker):
        ),
    }
    return mocker.patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
@@ -98,7 +98,7 @@ def mock_bad_json_returned(mocker):
        "http://keycloak.url/auth/realms/master/protocol/openid-connect/token": create_wrapper('{"access_token":'),
    }
    return mocker.patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
@@ -130,7 +130,7 @@ def mock_401_returned(mocker):
        ),
    }
    return mocker.patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
@@ -154,7 +154,7 @@ def mock_json_without_token_returned(mocker):
        ),
    }
    return mocker.patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/module_utils/_net_tools/pritunl/test_api.py
+++ b/tests/unit/plugins/module_utils/_net_tools/pritunl/test_api.py
@@ -10,9 +10,7 @@ from unittest.mock import MagicMock
 import pytest
 from ansible.module_utils.common.dict_transformations import dict_merge

-from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl import (
-    api,
-)
+from ansible_collections.community.general.plugins.module_utils import _pritunl_api as api

 # Pritunl Mocks

--- a/tests/unit/plugins/module_utils/test__scaleway.py
+++ b/tests/unit/plugins/module_utils/test__scaleway.py
--- a/tests/unit/plugins/modules/test_bitbucket_access_key.py
+++ b/tests/unit/plugins/modules/test_bitbucket_access_key.py
@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
    set_module_args,
 )

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
 from ansible_collections.community.general.plugins.modules import bitbucket_access_key


--- a/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py
+++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py
@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
    set_module_args,
 )

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
 from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_key_pair


--- a/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py
+++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py
@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
    set_module_args,
 )

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
 from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_known_host
 from ansible_collections.community.general.plugins.modules.bitbucket_pipeline_known_host import HAS_PARAMIKO

--- a/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py
+++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py
@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
    set_module_args,
 )

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
 from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_variable


--- a/tests/unit/plugins/modules/test_keycloak_authentication.py
+++ b/tests/unit/plugins/modules/test_keycloak_authentication.py
@@ -102,7 +102,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py
+++ b/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py
@@ -98,7 +98,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_client.py
+++ b/tests/unit/plugins/modules/test_keycloak_client.py
@@ -90,7 +90,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py
+++ b/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py
@@ -119,7 +119,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_clientscope.py
+++ b/tests/unit/plugins/modules/test_keycloak_clientscope.py
@@ -124,7 +124,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_component.py
+++ b/tests/unit/plugins/modules/test_keycloak_component.py
@@ -69,7 +69,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_identity_provider.py
+++ b/tests/unit/plugins/modules/test_keycloak_identity_provider.py
@@ -122,7 +122,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_realm.py
+++ b/tests/unit/plugins/modules/test_keycloak_realm.py
@@ -81,7 +81,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_realm_info.py
+++ b/tests/unit/plugins/modules/test_keycloak_realm_info.py
@@ -78,7 +78,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_realm_keys.py
+++ b/tests/unit/plugins/modules/test_keycloak_realm_keys.py
@@ -78,7 +78,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py
+++ b/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py
@@ -78,7 +78,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_realm_localization.py
+++ b/tests/unit/plugins/modules/test_keycloak_realm_localization.py
@@ -72,7 +72,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_role.py
+++ b/tests/unit/plugins/modules/test_keycloak_role.py
@@ -119,7 +119,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_user.py
+++ b/tests/unit/plugins/modules/test_keycloak_user.py
@@ -91,7 +91,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py
+++ b/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py
@@ -46,7 +46,7 @@ def _mock_good_connection():
        )
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=_build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_user_federation.py
+++ b/tests/unit/plugins/modules/test_keycloak_user_federation.py
@@ -78,7 +78,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_userprofile.py
+++ b/tests/unit/plugins/modules/test_keycloak_userprofile.py
@@ -79,7 +79,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_lxca_cmms.py
+++ b/tests/unit/plugins/modules/test_lxca_cmms.py
@@ -14,7 +14,7 @@ from ansible_collections.community.general.plugins.modules import lxca_cmms

@pytest.fixture(scope="module")
@mock.patch(
-    "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.close_conn",
+    "ansible_collections.community.general.plugins.module_utils._lxca_common.close_conn",
    autospec=True,
 )
 def setup_module(close_conn):
@@ -43,7 +43,7 @@ class TestMyModule:
    )
    @pytest.mark.usefixtures("patch_ansible_module")
    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms.execute_module", autospec=True)
@@ -59,7 +59,7 @@ class TestMyModule:
        assert "missing required arguments" in results["msg"]

    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms.execute_module", autospec=True)
@@ -87,7 +87,7 @@ class TestMyModule:
        assert mock.call(argument_spec=expected_arguments_spec, supports_check_mode=False) == ansible_mod_cls.call_args

    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms._cmms_by_uuid", autospec=True)
--- a/tests/unit/plugins/modules/test_lxca_nodes.py
+++ b/tests/unit/plugins/modules/test_lxca_nodes.py
@@ -14,7 +14,7 @@ from ansible_collections.community.general.plugins.modules import lxca_nodes

@pytest.fixture(scope="module")
@mock.patch(
-    "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.close_conn",
+    "ansible_collections.community.general.plugins.module_utils._lxca_common.close_conn",
    autospec=True,
 )
 def setup_module(close_conn):
@@ -43,7 +43,7 @@ class TestMyModule:
    )
    @pytest.mark.usefixtures("patch_ansible_module")
    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes.execute_module", autospec=True)
@@ -59,7 +59,7 @@ class TestMyModule:
        assert "missing required arguments" in results["msg"]

    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes.execute_module", autospec=True)
@@ -96,7 +96,7 @@ class TestMyModule:
        assert mock.call(argument_spec=expected_arguments_spec, supports_check_mode=False) == ansible_mod_cls.call_args

    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes._nodes_by_uuid", autospec=True)
--- a/tests/unit/plugins/modules/test_pritunl_org.py
+++ b/tests/unit/plugins/modules/test_pritunl_org.py
@@ -17,7 +17,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
 from ansible_collections.community.general.plugins.modules import (
    pritunl_org,
 )
-from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
+from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
    PritunlDeleteOrganizationMock,
    PritunlListOrganizationAfterPostMock,
    PritunlListOrganizationMock,
@@ -35,21 +35,21 @@ class TestPritunlOrg(ModuleTestCase):

    def patch_add_pritunl_organization(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._post_pritunl_organization",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._post_pritunl_organization",
            autospec=True,
            **kwds,
        )

    def patch_delete_pritunl_organization(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._delete_pritunl_organization",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._delete_pritunl_organization",
            autospec=True,
            **kwds,
        )

    def patch_get_pritunl_organizations(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
            autospec=True,
            **kwds,
        )
--- a/tests/unit/plugins/modules/test_pritunl_org_info.py
+++ b/tests/unit/plugins/modules/test_pritunl_org_info.py
@@ -16,7 +16,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
 from ansible_collections.community.general.plugins.modules import (
    pritunl_org_info,
 )
-from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
+from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
    PritunlEmptyOrganizationMock,
    PritunlListOrganizationMock,
 )
@@ -32,7 +32,7 @@ class TestPritunlOrgInfo(ModuleTestCase):

    def patch_get_pritunl_organizations(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
            autospec=True,
            **kwds,
        )
--- a/tests/unit/plugins/modules/test_pritunl_user.py
+++ b/tests/unit/plugins/modules/test_pritunl_user.py
@@ -17,7 +17,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
 from ansible_collections.community.general.plugins.modules import (
    pritunl_user,
 )
-from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
+from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
    PritunlDeleteUserMock,
    PritunlListOrganizationMock,
    PritunlListUserMock,
@@ -47,35 +47,35 @@ class TestPritunlUser(ModuleTestCase):

    def patch_get_pritunl_users(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_users",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_users",
            autospec=True,
            **kwds,
        )

    def patch_add_pritunl_users(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._post_pritunl_user",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._post_pritunl_user",
            autospec=True,
            **kwds,
        )

    def patch_update_pritunl_users(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._put_pritunl_user",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._put_pritunl_user",
            autospec=True,
            **kwds,
        )

    def patch_delete_pritunl_users(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._delete_pritunl_user",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._delete_pritunl_user",
            autospec=True,
            **kwds,
        )

    def patch_get_pritunl_organizations(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
            autospec=True,
            **kwds,
        )
--- a/tests/unit/plugins/modules/test_pritunl_user_info.py
+++ b/tests/unit/plugins/modules/test_pritunl_user_info.py
@@ -16,7 +16,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
 from ansible_collections.community.general.plugins.modules import (
    pritunl_user_info,
 )
-from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
+from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
    PritunlListOrganizationMock,
    PritunlListUserMock,
 )
@@ -32,14 +32,14 @@ class TestPritunlUserInfo(ModuleTestCase):

    def patch_get_pritunl_users(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_users",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_users",
            autospec=True,
            **kwds,
        )

    def patch_get_pritunl_organizations(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
            autospec=True,
            **kwds,
        )
--- a/tests/unit/plugins/modules/test_ss_3par_cpg.py
+++ b/tests/unit/plugins/modules/test_ss_3par_cpg.py
@@ -11,7 +11,7 @@ sys.modules["hpe3par_sdk"] = mock.Mock()
 sys.modules["hpe3par_sdk.client"] = mock.Mock()
 sys.modules["hpe3parclient"] = mock.Mock()
 sys.modules["hpe3parclient.exceptions"] = mock.Mock()
-from ansible_collections.community.general.plugins.module_utils._storage.hpe3par import hpe3par
+from ansible_collections.community.general.plugins.module_utils import _hpe3par as hpe3par
 from ansible_collections.community.general.plugins.modules import ss_3par_cpg