diff --git a/src/PresentationalComponents/ImageBuildStatus/ImageBuildStatus.js b/src/PresentationalComponents/ImagesTable/ImageBuildStatus.js
similarity index 100%
rename from src/PresentationalComponents/ImageBuildStatus/ImageBuildStatus.js
rename to src/PresentationalComponents/ImagesTable/ImageBuildStatus.js
diff --git a/src/PresentationalComponents/ImageBuildStatus/ImageBuildStatus.scss b/src/PresentationalComponents/ImagesTable/ImageBuildStatus.scss
similarity index 100%
rename from src/PresentationalComponents/ImageBuildStatus/ImageBuildStatus.scss
rename to src/PresentationalComponents/ImagesTable/ImageBuildStatus.scss
diff --git a/src/PresentationalComponents/Release/Release.js b/src/PresentationalComponents/ImagesTable/Release.js
similarity index 100%
rename from src/PresentationalComponents/Release/Release.js
rename to src/PresentationalComponents/ImagesTable/Release.js
diff --git a/src/SmartComponents/ImagesTable/ImagesTable.js b/src/SmartComponents/ImagesTable/ImagesTable.js
index 97703815..45c654d9 100644
--- a/src/SmartComponents/ImagesTable/ImagesTable.js
+++ b/src/SmartComponents/ImagesTable/ImagesTable.js
@@ -8,8 +8,8 @@ import { TableToolbar } from '@redhat-cloud-services/frontend-components';
 import { ToolbarGroup, ToolbarItem, EmptyState, EmptyStateVariant, EmptyStateIcon, EmptyStateBody, Title } from '@patternfly/react-core';
 import { PlusCircleIcon } from '@patternfly/react-icons';
 
-import ImageBuildStatus from '../../PresentationalComponents/ImageBuildStatus/ImageBuildStatus';
-import Release from '../../PresentationalComponents/Release/Release';
+import ImageBuildStatus from '../../PresentationalComponents/ImagesTable/ImageBuildStatus';
+import Release from '../../PresentationalComponents/ImagesTable/Release';
 
 import api from '../../api.js';
 
diff --git a/src/test/SmartComponents/ImagesTable/ImagesTable.test.js b/src/test/SmartComponents/ImagesTable/ImagesTable.test.js
index aceb3269..08d85d37 100644
--- a/src/test/SmartComponents/ImagesTable/ImagesTable.test.js
+++ b/src/test/SmartComponents/ImagesTable/ImagesTable.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { screen, render } from '@testing-library/react';
 import { renderWithReduxRouter } from '../../testUtils';
 import ImagesTable from '../../../SmartComponents/ImagesTable/ImagesTable';
-import ImageBuildStatus from '../../../PresentationalComponents/ImageBuildStatus/ImageBuildStatus';
+import ImageBuildStatus from '../../../PresentationalComponents/ImagesTable/ImageBuildStatus';
 import '@testing-library/jest-dom';
 
 const store = {
@@ -39,7 +39,7 @@ describe('Images Table', () => {
 
         // make sure the empty-state message isn't present
         const emptyState = screen.queryByTestId('empty-state');
-        expect(emptyState).toBeNull();
+        expect(emptyState).not.toBeInTheDocument();
 
         // check table
         const table = screen.getByTestId('images-table');