diff --git a/ansible/group_vars/switches/config b/ansible/group_vars/all/switches/config
similarity index 100%
rename from ansible/group_vars/switches/config
rename to ansible/group_vars/all/switches/config
diff --git a/ansible/group_vars/switches/dell b/ansible/group_vars/all/switches/dell
similarity index 100%
rename from ansible/group_vars/switches/dell
rename to ansible/group_vars/all/switches/dell
diff --git a/ansible/group_vars/switches/dell-powerconnect b/ansible/group_vars/all/switches/dell-powerconnect
similarity index 100%
rename from ansible/group_vars/switches/dell-powerconnect
rename to ansible/group_vars/all/switches/dell-powerconnect
diff --git a/ansible/group_vars/switches/junos b/ansible/group_vars/all/switches/junos
similarity index 100%
rename from ansible/group_vars/switches/junos
rename to ansible/group_vars/all/switches/junos
diff --git a/ansible/group_vars/switches/mellanox b/ansible/group_vars/all/switches/mellanox
similarity index 100%
rename from ansible/group_vars/switches/mellanox
rename to ansible/group_vars/all/switches/mellanox