diff --git a/src/Button/RotationButton/RotationButton.tsx b/src/Button/RotationButton/RotationButton.tsx
index 9c1158021..903a038e0 100644
--- a/src/Button/RotationButton/RotationButton.tsx
+++ b/src/Button/RotationButton/RotationButton.tsx
@@ -1,6 +1,6 @@
 import { faArrowsRotate } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { useOlInteraction } from '@terrestris/react-util/';
+import useOlInteraction from '@terrestris/react-util/dist/Hooks/useOlInteraction/useOlInteraction';
 import { DragRotateAndZoom } from 'ol/interaction.js';
 import React from 'react';
 
@@ -35,4 +35,5 @@ export const RotationButton: React.FC<RotationButtonProps> = ({
     />
   );
 };
+
 export default RotationButton;
diff --git a/src/Container/AddWmsPanel/AddWmsLayerEntry/AddWmsLayerEntry.tsx b/src/Container/AddWmsPanel/AddWmsLayerEntry/AddWmsLayerEntry.tsx
index e538be6c1..c93a4c1de 100644
--- a/src/Container/AddWmsPanel/AddWmsLayerEntry/AddWmsLayerEntry.tsx
+++ b/src/Container/AddWmsPanel/AddWmsLayerEntry/AddWmsLayerEntry.tsx
@@ -2,7 +2,7 @@ import './AddWmsLayerEntry.less';
 
 import { faCopyright, faInfo } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { WmsLayer } from '@terrestris/ol-util';
+import { WmsLayer } from '@terrestris/ol-util/dist/typeUtils/typeUtils';
 import { Checkbox, Tooltip } from 'antd';
 import OlMap from 'ol/Map';
 import React, { useEffect, useState } from 'react';
diff --git a/src/Container/AddWmsPanel/AddWmsPanel.example.md b/src/Container/AddWmsPanel/AddWmsPanel.example.md
index 2de8d2b33..4e946cac3 100644
--- a/src/Container/AddWmsPanel/AddWmsPanel.example.md
+++ b/src/Container/AddWmsPanel/AddWmsPanel.example.md
@@ -3,7 +3,7 @@ The capabilities of this WMS are fetched and parsed to OL layer instances using
 An `AddWmsPanel` shows a list of the parsed layers and each checked layer (or the entire set) can be added to the map.
 
 ```jsx
-import { WmsLayer } from '@terrestris/ol-util';
+import { WmsLayer } from '@terrestris/ol-util/dist/typeUtils/typeUtils';
 import CapabilitiesUtil from '@terrestris/ol-util/dist/CapabilitiesUtil/CapabilitiesUtil';
 import SimpleButton from '@terrestris/react-geo/dist/Button/SimpleButton/SimpleButton';
 import AddWmsPanel from '@terrestris/react-geo/dist/Container/AddWmsPanel/AddWmsPanel';
diff --git a/src/Container/AddWmsPanel/AddWmsPanel.tsx b/src/Container/AddWmsPanel/AddWmsPanel.tsx
index 6d9bd8904..f2ec70df3 100644
--- a/src/Container/AddWmsPanel/AddWmsPanel.tsx
+++ b/src/Container/AddWmsPanel/AddWmsPanel.tsx
@@ -1,7 +1,7 @@
 import './AddWmsPanel.less';
 
 import Logger from '@terrestris/base-util/dist/Logger';
-import { WmsLayer } from '@terrestris/ol-util';
+import { WmsLayer } from '@terrestris/ol-util/dist/typeUtils/typeUtils';
 import useMap from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 import { Checkbox } from 'antd';
 import React, { useState } from 'react';
diff --git a/src/Grid/AgFeatureGrid/AgFeatureGrid.tsx b/src/Grid/AgFeatureGrid/AgFeatureGrid.tsx
index 658d51d18..e33a90cb7 100644
--- a/src/Grid/AgFeatureGrid/AgFeatureGrid.tsx
+++ b/src/Grid/AgFeatureGrid/AgFeatureGrid.tsx
@@ -2,7 +2,7 @@ import 'ag-grid-community/styles/ag-grid.css';
 import 'ag-grid-community/styles/ag-theme-balham.css';
 
 import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
-import { useOlLayer } from '@terrestris/react-util';
+import useOlLayer from '@terrestris/react-util/dist/Hooks/useOlLayer/useOlLayer';
 import useMap from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 import {
   CellMouseOutEvent,
diff --git a/src/Legend/Legend.tsx b/src/Legend/Legend.tsx
index 427956683..6e85585a9 100644
--- a/src/Legend/Legend.tsx
+++ b/src/Legend/Legend.tsx
@@ -1,7 +1,8 @@
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import Logger from '@terrestris/base-util/dist/Logger';
-import { MapUtil, WmsLayer } from '@terrestris/ol-util';
+import { WmsLayer } from '@terrestris/ol-util/dist/typeUtils/typeUtils';
+import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 import { Spin } from 'antd';
 import * as React from 'react';
 import { useCallback, useEffect, useState } from 'react';
diff --git a/src/Panel/TimeLayerSliderPanel/TimeLayerSliderPanel.tsx b/src/Panel/TimeLayerSliderPanel/TimeLayerSliderPanel.tsx
index a6f8f8cc5..1274ebe05 100644
--- a/src/Panel/TimeLayerSliderPanel/TimeLayerSliderPanel.tsx
+++ b/src/Panel/TimeLayerSliderPanel/TimeLayerSliderPanel.tsx
@@ -1,4 +1,4 @@
-import { WmsLayer } from '@terrestris/ol-util';
+import { WmsLayer } from '@terrestris/ol-util/dist/typeUtils/typeUtils';
 import { DatePicker, Popover, Select } from 'antd';
 import dayjs from 'dayjs';
 import _isEqual from 'lodash/isEqual';