diff --git a/vyos/vyos/plugins/module_utils/network/vyos/__init__.py b/plugins/module_utils/network/vyos/__init__.py
similarity index 100%
rename from vyos/vyos/plugins/module_utils/network/vyos/__init__.py
rename to plugins/module_utils/network/vyos/__init__.py
diff --git a/vyos/vyos/plugins/module_utils/network/vyos/vyos.py b/plugins/module_utils/network/vyos/vyos.py
similarity index 100%
rename from vyos/vyos/plugins/module_utils/network/vyos/vyos.py
rename to plugins/module_utils/network/vyos/vyos.py
diff --git a/vyos/vyos/plugins/modules/__init__.py b/plugins/modules/__init__.py
similarity index 100%
rename from vyos/vyos/plugins/modules/__init__.py
rename to plugins/modules/__init__.py
diff --git a/vyos/vyos/plugins/modules/vyos_banner.py b/plugins/modules/vyos_banner.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_banner.py
rename to plugins/modules/vyos_banner.py
diff --git a/vyos/vyos/plugins/modules/vyos_command.py b/plugins/modules/vyos_command.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_command.py
rename to plugins/modules/vyos_command.py
diff --git a/vyos/vyos/plugins/modules/vyos_config.py b/plugins/modules/vyos_config.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_config.py
rename to plugins/modules/vyos_config.py
diff --git a/vyos/vyos/plugins/modules/vyos_facts.py b/plugins/modules/vyos_facts.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_facts.py
rename to plugins/modules/vyos_facts.py
diff --git a/vyos/vyos/plugins/modules/vyos_interface.py b/plugins/modules/vyos_interface.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_interface.py
rename to plugins/modules/vyos_interface.py
diff --git a/vyos/vyos/plugins/modules/vyos_l3_interface.py b/plugins/modules/vyos_l3_interface.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_l3_interface.py
rename to plugins/modules/vyos_l3_interface.py
diff --git a/vyos/vyos/plugins/modules/vyos_linkagg.py b/plugins/modules/vyos_linkagg.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_linkagg.py
rename to plugins/modules/vyos_linkagg.py
diff --git a/vyos/vyos/plugins/modules/vyos_lldp.py b/plugins/modules/vyos_lldp.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_lldp.py
rename to plugins/modules/vyos_lldp.py
diff --git a/vyos/vyos/plugins/modules/vyos_lldp_interface.py b/plugins/modules/vyos_lldp_interface.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_lldp_interface.py
rename to plugins/modules/vyos_lldp_interface.py
diff --git a/vyos/vyos/plugins/modules/vyos_logging.py b/plugins/modules/vyos_logging.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_logging.py
rename to plugins/modules/vyos_logging.py
diff --git a/vyos/vyos/plugins/modules/vyos_ping.py b/plugins/modules/vyos_ping.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_ping.py
rename to plugins/modules/vyos_ping.py
diff --git a/vyos/vyos/plugins/modules/vyos_static_route.py b/plugins/modules/vyos_static_route.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_static_route.py
rename to plugins/modules/vyos_static_route.py
diff --git a/vyos/vyos/plugins/modules/vyos_system.py b/plugins/modules/vyos_system.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_system.py
rename to plugins/modules/vyos_system.py
diff --git a/vyos/vyos/plugins/modules/vyos_user.py b/plugins/modules/vyos_user.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_user.py
rename to plugins/modules/vyos_user.py
diff --git a/vyos/vyos/plugins/modules/vyos_vlan.py b/plugins/modules/vyos_vlan.py
similarity index 100%
rename from vyos/vyos/plugins/modules/vyos_vlan.py
rename to plugins/modules/vyos_vlan.py