diff --git a/etc/vitrage/states_plugins/cinder.volume.yaml b/etc/vitrage/datasources_states/cinder.volume.yaml
similarity index 100%
rename from etc/vitrage/states_plugins/cinder.volume.yaml
rename to etc/vitrage/datasources_states/cinder.volume.yaml
diff --git a/etc/vitrage/states_plugins/nagios.yaml b/etc/vitrage/datasources_states/nagios.yaml
similarity index 100%
rename from etc/vitrage/states_plugins/nagios.yaml
rename to etc/vitrage/datasources_states/nagios.yaml
diff --git a/etc/vitrage/states_plugins/nova.host.yaml b/etc/vitrage/datasources_states/nova.host.yaml
similarity index 100%
rename from etc/vitrage/states_plugins/nova.host.yaml
rename to etc/vitrage/datasources_states/nova.host.yaml
diff --git a/etc/vitrage/states_plugins/nova.instance.yaml b/etc/vitrage/datasources_states/nova.instance.yaml
similarity index 100%
rename from etc/vitrage/states_plugins/nova.instance.yaml
rename to etc/vitrage/datasources_states/nova.instance.yaml
diff --git a/etc/vitrage/states_plugins/nova.zone.yaml b/etc/vitrage/datasources_states/nova.zone.yaml
similarity index 100%
rename from etc/vitrage/states_plugins/nova.zone.yaml
rename to etc/vitrage/datasources_states/nova.zone.yaml
diff --git a/etc/vitrage/states_plugins/openstack.node.yaml b/etc/vitrage/datasources_states/openstack.node.yaml
similarity index 100%
rename from etc/vitrage/states_plugins/openstack.node.yaml
rename to etc/vitrage/datasources_states/openstack.node.yaml
diff --git a/etc/vitrage/states_plugins/switch.yaml b/etc/vitrage/datasources_states/switch.yaml
similarity index 100%
rename from etc/vitrage/states_plugins/switch.yaml
rename to etc/vitrage/datasources_states/switch.yaml
diff --git a/etc/vitrage/states_plugins/vitrage.yaml b/etc/vitrage/datasources_states/vitrage.yaml
similarity index 100%
rename from etc/vitrage/states_plugins/vitrage.yaml
rename to etc/vitrage/datasources_states/vitrage.yaml