diff --git a/packages/grafnode-components/src/components/QueryResult/StyledWrapper.js b/packages/grafnode-components/src/components/ResponsePane/QueryResult/StyledWrapper.js
similarity index 100%
rename from packages/grafnode-components/src/components/QueryResult/StyledWrapper.js
rename to packages/grafnode-components/src/components/ResponsePane/QueryResult/StyledWrapper.js
diff --git a/packages/grafnode-components/src/components/QueryResult/index.js b/packages/grafnode-components/src/components/ResponsePane/QueryResult/index.js
similarity index 98%
rename from packages/grafnode-components/src/components/QueryResult/index.js
rename to packages/grafnode-components/src/components/ResponsePane/QueryResult/index.js
index 9546ff70..c2a5be88 100644
--- a/packages/grafnode-components/src/components/QueryResult/index.js
+++ b/packages/grafnode-components/src/components/ResponsePane/QueryResult/index.js
@@ -1,6 +1,6 @@
 import React, { useState, useRef, useEffect } from 'react';
 import { IconRefresh } from '@tabler/icons';
-import StopWatch from '../StopWatch';
+import StopWatch from '../../StopWatch';
 import * as CodeMirror from 'codemirror';
 import StyledWrapper from './StyledWrapper';
 
diff --git a/packages/grafnode-components/src/components/ResponseHeaders/StyledWrapper.js b/packages/grafnode-components/src/components/ResponsePane/ResponseHeaders/StyledWrapper.js
similarity index 100%
rename from packages/grafnode-components/src/components/ResponseHeaders/StyledWrapper.js
rename to packages/grafnode-components/src/components/ResponsePane/ResponseHeaders/StyledWrapper.js
diff --git a/packages/grafnode-components/src/components/ResponseHeaders/index.js b/packages/grafnode-components/src/components/ResponsePane/ResponseHeaders/index.js
similarity index 100%
rename from packages/grafnode-components/src/components/ResponseHeaders/index.js
rename to packages/grafnode-components/src/components/ResponsePane/ResponseHeaders/index.js
diff --git a/packages/grafnode-components/src/components/ResponsePane/index.js b/packages/grafnode-components/src/components/ResponsePane/index.js
index 042d516a..33961256 100644
--- a/packages/grafnode-components/src/components/ResponsePane/index.js
+++ b/packages/grafnode-components/src/components/ResponsePane/index.js
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import classnames from 'classnames';
-import QueryResult from '../QueryResult';
-import ResponseHeaders from '../ResponseHeaders';
+import QueryResult from './QueryResult';
+import ResponseHeaders from './ResponseHeaders';
 import StyledWrapper from './StyledWrapper';
 
 const ResponsePane = ({rightPaneWidth, data, isLoading, headers}) => {