diff --git a/src/datasource-zabbix/FunctionEditor.tsx b/src/datasource-zabbix/components/FunctionEditor.tsx
similarity index 100%
rename from src/datasource-zabbix/FunctionEditor.tsx
rename to src/datasource-zabbix/components/FunctionEditor.tsx
diff --git a/src/datasource-zabbix/FunctionEditorControls.tsx b/src/datasource-zabbix/components/FunctionEditorControls.tsx
similarity index 100%
rename from src/datasource-zabbix/FunctionEditorControls.tsx
rename to src/datasource-zabbix/components/FunctionEditorControls.tsx
diff --git a/src/datasource-zabbix/metric-function-editor.directive.ts b/src/datasource-zabbix/metric-function-editor.directive.ts
index 232025d..7046cc2 100644
--- a/src/datasource-zabbix/metric-function-editor.directive.ts
+++ b/src/datasource-zabbix/metric-function-editor.directive.ts
@@ -2,7 +2,7 @@ import coreModule from 'grafana/app/core/core_module';
 import _ from 'lodash';
 import $ from 'jquery';
 import { react2AngularDirective } from './react2angular';
-import { FunctionEditor } from './FunctionEditor';
+import { FunctionEditor } from './components/FunctionEditor';
 
 /** @ngInject */
 export function zabbixFunctionEditor($compile, templateSrv) {