diff --git a/src/login-web-app/src/haapi-stepper/feature/index.ts b/src/login-web-app/src/haapi-stepper/feature/index.ts
index fd914baf..022001c1 100644
--- a/src/login-web-app/src/haapi-stepper/feature/index.ts
+++ b/src/login-web-app/src/haapi-stepper/feature/index.ts
@@ -16,7 +16,7 @@ export * from './stepper/HaapiStepperHook';
 export * from './stepper/haapi-stepper.types';
 export * from './stepper/data-formatters/format-next-step-data';
 export * from './stepper/data-formatters/continue-same-step';
-export * from './stepper/data-formatters/polling-step';
+export * from './stepper/step-handlers/polling-step';
 export * from './stepper/data-formatters/problem-step';
 
 export * from './steps/HaapiStepperStepUI';
diff --git a/src/login-web-app/src/haapi-stepper/feature/stepper/HaapiStepper.tsx b/src/login-web-app/src/haapi-stepper/feature/stepper/HaapiStepper.tsx
index 7a04c357..b913486f 100644
--- a/src/login-web-app/src/haapi-stepper/feature/stepper/HaapiStepper.tsx
+++ b/src/login-web-app/src/haapi-stepper/feature/stepper/HaapiStepper.tsx
@@ -22,7 +22,7 @@ import {
 import { HaapiStepperContext } from './HaapiStepperContext';
 import { isClientOperation, performClientOperation } from '../actions/client-operation/client-operations';
 import { formatContinueSameStepData } from './data-formatters/continue-same-step';
-import { handlePollingStep } from './data-formatters/polling-step';
+import { handlePollingStep } from './step-handlers/polling-step';
 import { formatErrorStepData } from './data-formatters/problem-step';
 import { formatNextStepData } from './data-formatters/format-next-step-data';
 import { handleCompletedWithSuccessStep } from './step-handlers/completed-with-success-step';
diff --git a/src/login-web-app/src/haapi-stepper/feature/stepper/data-formatters/polling-step.ts b/src/login-web-app/src/haapi-stepper/feature/stepper/step-handlers/polling-step.ts
similarity index 97%
rename from src/login-web-app/src/haapi-stepper/feature/stepper/data-formatters/polling-step.ts
rename to src/login-web-app/src/haapi-stepper/feature/stepper/step-handlers/polling-step.ts
index f9f806cc..12e9a204 100644
--- a/src/login-web-app/src/haapi-stepper/feature/stepper/data-formatters/polling-step.ts
+++ b/src/login-web-app/src/haapi-stepper/feature/stepper/step-handlers/polling-step.ts
@@ -7,7 +7,7 @@ import type {
   HaapiStepperHistoryEntry,
 } from '../haapi-stepper.types';
 import { HaapiStepperConfig } from '../HaapiStepper';
-import { formatNextStepData } from './format-next-step-data';
+import { formatNextStepData } from '../data-formatters/format-next-step-data';
 import { HAAPI_FORM_ACTION_KINDS } from '../../../data-access/types/haapi-action.types';
 import { isBankIdClientOperation } from '../../actions/client-operation/client-operations';
 import { openBankIdApp } from '../../actions/client-operation/openBankIdApp';