-import OCPPError from '../../exception/OCPPError';
-import type { HandleErrorParams } from '../../types/Error';
-import type { JsonObject, JsonType } from '../../types/JsonType';
-import type { OCPPVersion } from '../../types/ocpp/OCPPVersion';
-import type { IncomingRequestCommand } from '../../types/ocpp/Requests';
-import type { ClearCacheResponse } from '../../types/ocpp/Responses';
-import logger from '../../utils/Logger';
-import type ChargingStation from '../ChargingStation';
-import { ChargingStationUtils } from '../ChargingStationUtils';
-import OCPPConstants from './OCPPConstants';
-import { OCPPServiceUtils } from './OCPPServiceUtils';
+import { OCPPConstants, OCPPServiceUtils } from './internal';
+import { type ChargingStation, ChargingStationUtils } from '../../charging-station';
+import { OCPPError } from '../../exception';
+import type {
+ ClearCacheResponse,
+ HandleErrorParams,
+ IncomingRequestCommand,
+ JsonObject,
+ JsonType,
+ OCPPVersion,
+} from '../../types';
+import { logger } from '../../utils';