diff --git a/oarepo_ui/templates/components/IBaseField.jinja b/oarepo_ui/templates/components/datafields/IBaseField.jinja
similarity index 100%
rename from oarepo_ui/templates/components/IBaseField.jinja
rename to oarepo_ui/templates/components/datafields/IBaseField.jinja
diff --git a/oarepo_ui/templates/components/IField.jinja b/oarepo_ui/templates/components/datafields/IField.jinja
similarity index 100%
rename from oarepo_ui/templates/components/IField.jinja
rename to oarepo_ui/templates/components/datafields/IField.jinja
diff --git a/oarepo_ui/templates/components/INonEmpty.jinja b/oarepo_ui/templates/components/datafields/INonEmpty.jinja
similarity index 100%
rename from oarepo_ui/templates/components/INonEmpty.jinja
rename to oarepo_ui/templates/components/datafields/INonEmpty.jinja
diff --git a/oarepo_ui/templates/components/IValue.jinja b/oarepo_ui/templates/components/datafields/IValue.jinja
similarity index 100%
rename from oarepo_ui/templates/components/IValue.jinja
rename to oarepo_ui/templates/components/datafields/IValue.jinja
diff --git a/oarepo_ui/templates/components/IValueList.jinja b/oarepo_ui/templates/components/datafields/IValueList.jinja
similarity index 100%
rename from oarepo_ui/templates/components/IValueList.jinja
rename to oarepo_ui/templates/components/datafields/IValueList.jinja