diff --git a/packages/dockview-core/src/__tests__/dockview/dockviewComponent.spec.ts b/packages/dockview-core/src/__tests__/dockview/dockviewComponent.spec.ts
index 0cea829c4..5003460f5 100644
--- a/packages/dockview-core/src/__tests__/dockview/dockviewComponent.spec.ts
+++ b/packages/dockview-core/src/__tests__/dockview/dockviewComponent.spec.ts
@@ -8,7 +8,7 @@ import {
     IGroupPanelInitParameters,
 } from '../../dockview/types';
 import { PanelUpdateEvent } from '../../panel/types';
-import { Orientation } from '../../splitview/core/splitview';
+import { Orientation } from '../../splitview/splitview';
 import { CompositeDisposable } from '../../lifecycle';
 import { Emitter } from '../../events';
 import { IDockviewPanel } from '../../dockview/dockviewPanel';
diff --git a/packages/dockview-core/src/__tests__/gridview/baseComponentGridview.spec.ts b/packages/dockview-core/src/__tests__/gridview/baseComponentGridview.spec.ts
index 2019d8f3a..74a1df1d1 100644
--- a/packages/dockview-core/src/__tests__/gridview/baseComponentGridview.spec.ts
+++ b/packages/dockview-core/src/__tests__/gridview/baseComponentGridview.spec.ts
@@ -11,7 +11,7 @@ import {
     PanelUpdateEvent,
     Parameters,
 } from '../../panel/types';
-import { LayoutPriority, Orientation } from '../../splitview/core/splitview';
+import { LayoutPriority, Orientation } from '../../splitview/splitview';
 
 class TestPanel implements IGridPanelView {
     _onDidChange = new Emitter<IViewSize | undefined>();
diff --git a/packages/dockview-core/src/__tests__/gridview/gridview.spec.ts b/packages/dockview-core/src/__tests__/gridview/gridview.spec.ts
index 9574f8069..d796b888a 100644
--- a/packages/dockview-core/src/__tests__/gridview/gridview.spec.ts
+++ b/packages/dockview-core/src/__tests__/gridview/gridview.spec.ts
@@ -1,5 +1,5 @@
 import { Gridview } from '../../gridview/gridview';
-import { Orientation } from '../../splitview/core/splitview';
+import { Orientation } from '../../splitview/splitview';
 
 describe('gridview', () => {
     let container: HTMLElement;
diff --git a/packages/dockview-core/src/__tests__/gridview/gridviewComponent.spec.ts b/packages/dockview-core/src/__tests__/gridview/gridviewComponent.spec.ts
index ab17a0a15..f28c2f828 100644
--- a/packages/dockview-core/src/__tests__/gridview/gridviewComponent.spec.ts
+++ b/packages/dockview-core/src/__tests__/gridview/gridviewComponent.spec.ts
@@ -2,7 +2,7 @@ import { GridviewComponent } from '../../gridview/gridviewComponent';
 import { GridviewPanel } from '../../gridview/gridviewPanel';
 import { CompositeDisposable } from '../../lifecycle';
 import { IFrameworkPart } from '../../panel/types';
-import { Orientation } from '../../splitview/core/splitview';
+import { Orientation } from '../../splitview/splitview';
 
 class TestGridview extends GridviewPanel {
     constructor(id: string, componentName: string) {
diff --git a/packages/dockview-core/src/__tests__/paneview/paneview.spec.ts b/packages/dockview-core/src/__tests__/paneview/paneview.spec.ts
index 1abefcf0c..b74c81e2b 100644
--- a/packages/dockview-core/src/__tests__/paneview/paneview.spec.ts
+++ b/packages/dockview-core/src/__tests__/paneview/paneview.spec.ts
@@ -5,7 +5,7 @@ import {
     IPaneHeaderPart,
     PaneviewPanel,
 } from '../../paneview/paneviewPanel';
-import { Orientation } from '../../splitview/core/splitview';
+import { Orientation } from '../../splitview/splitview';
 
 class TestPanel extends PaneviewPanel {
     protected getBodyComponent(): IPaneBodyPart {
diff --git a/packages/dockview-core/src/__tests__/paneview/paneviewComponent.spec.ts b/packages/dockview-core/src/__tests__/paneview/paneviewComponent.spec.ts
index f47da6f5d..859095735 100644
--- a/packages/dockview-core/src/__tests__/paneview/paneviewComponent.spec.ts
+++ b/packages/dockview-core/src/__tests__/paneview/paneviewComponent.spec.ts
@@ -8,7 +8,7 @@ import {
     IPaneHeaderPart,
     PanePanelComponentInitParameter,
 } from '../../paneview/paneviewPanel';
-import { Orientation } from '../../splitview/core/splitview';
+import { Orientation } from '../../splitview/splitview';
 
 class TestPanel extends PaneviewPanel {
     constructor(id: string, component: string) {
diff --git a/packages/dockview-core/src/__tests__/splitview/core/splitview.spec.ts b/packages/dockview-core/src/__tests__/splitview/splitview.spec.ts
similarity index 99%
rename from packages/dockview-core/src/__tests__/splitview/core/splitview.spec.ts
rename to packages/dockview-core/src/__tests__/splitview/splitview.spec.ts
index a2357bf02..60d94d513 100644
--- a/packages/dockview-core/src/__tests__/splitview/core/splitview.spec.ts
+++ b/packages/dockview-core/src/__tests__/splitview/splitview.spec.ts
@@ -1,12 +1,12 @@
-import { Emitter } from '../../../events';
-import { CompositeDisposable } from '../../../lifecycle';
+import { Emitter } from '../../events';
+import { CompositeDisposable } from '../../lifecycle';
 import {
     IView,
     LayoutPriority,
     Orientation,
     Sizing,
     Splitview,
-} from '../../../splitview/core/splitview';
+} from '../../splitview/splitview';
 
 class Testview implements IView {
     private _element: HTMLElement = document.createElement('div');
diff --git a/packages/dockview-core/src/__tests__/splitview/splitviewComponent.spec.ts b/packages/dockview-core/src/__tests__/splitview/splitviewComponent.spec.ts
index a6cca1bf6..03450f1f1 100644
--- a/packages/dockview-core/src/__tests__/splitview/splitviewComponent.spec.ts
+++ b/packages/dockview-core/src/__tests__/splitview/splitviewComponent.spec.ts
@@ -1,6 +1,6 @@
 import { PanelDimensionChangeEvent } from '../../api/panelApi';
 import { CompositeDisposable } from '../../lifecycle';
-import { Orientation } from '../../splitview/core/splitview';
+import { Orientation } from '../../splitview/splitview';
 import { SplitviewComponent } from '../../splitview/splitviewComponent';
 import { SplitviewPanel } from '../../splitview/splitviewPanel';
 
diff --git a/packages/dockview-core/src/actionbar/actionsContainer.scss b/packages/dockview-core/src/actionbar/actionsContainer.scss
deleted file mode 100644
index b3dbf769e..000000000
--- a/packages/dockview-core/src/actionbar/actionsContainer.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-.actions-bar {
-    text-align: right;
-    width: 28px;
-    display: flex;
-    align-items: center;
-    flex-shrink: 0;
-
-    .actions-container {
-        display: flex;
-        padding: 0px;
-        margin: 0px;
-        justify-content: flex-end;
-
-        .close-action {
-            padding: 4px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            box-sizing: border-box;
-            cursor: pointer;
-            color: var(--dv-activegroup-hiddenpanel-tab-color);
-
-            &:hover {
-                border-radius: 2px;
-                background-color: var(--dv-icon-hover-background-color);
-            }
-        }
-    }
-}
diff --git a/packages/dockview-core/src/actionbar/actionsContainer.ts b/packages/dockview-core/src/actionbar/actionsContainer.ts
deleted file mode 100644
index c6f17e0be..000000000
--- a/packages/dockview-core/src/actionbar/actionsContainer.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export class ActionContainer {
-    private _element: HTMLElement;
-    private _list: HTMLElement;
-
-    get element(): HTMLElement {
-        return this._element;
-    }
-
-    constructor() {
-        this._element = document.createElement('div');
-        this._element.className = 'actions-bar';
-
-        this._list = document.createElement('ul');
-        this._list.className = 'actions-container';
-
-        this._element.appendChild(this._list);
-    }
-
-    public add(element: HTMLElement): void {
-        const listItem = document.createElement('li');
-        listItem.className = 'action-item';
-        this._list.appendChild(element);
-    }
-}
diff --git a/packages/dockview-core/src/api/component.api.ts b/packages/dockview-core/src/api/component.api.ts
index 95a93be5a..4de792690 100644
--- a/packages/dockview-core/src/api/component.api.ts
+++ b/packages/dockview-core/src/api/component.api.ts
@@ -28,7 +28,7 @@ import {
     SerializedSplitview,
     SplitviewComponentUpdateOptions,
 } from '../splitview/splitviewComponent';
-import { IView, Orientation, Sizing } from '../splitview/core/splitview';
+import { IView, Orientation, Sizing } from '../splitview/splitview';
 import { ISplitviewPanel } from '../splitview/splitviewPanel';
 import {
     DockviewGroupPanel,
diff --git a/packages/dockview-core/src/dockview/components/watermark/watermark.scss b/packages/dockview-core/src/dockview/components/watermark/watermark.scss
index a1e4b7a85..85144e953 100644
--- a/packages/dockview-core/src/dockview/components/watermark/watermark.scss
+++ b/packages/dockview-core/src/dockview/components/watermark/watermark.scss
@@ -4,7 +4,7 @@
 
     &.has-actions {
         .watermark-title {
-            .actions-bar {
+            .actions-container {
                 display: none;
             }
         }
@@ -18,4 +18,28 @@
     .watermark-content {
         flex-grow: 1;
     }
+
+    .actions-container {
+        display: flex;
+        align-items: center;
+        padding: 0px 8px;
+        // padding: 0px;
+        // margin: 0px;
+        // justify-content: flex-end;
+
+        .close-action {
+            padding: 4px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            cursor: pointer;
+            color: var(--dv-activegroup-hiddenpanel-tab-color);
+
+            &:hover {
+                border-radius: 2px;
+                background-color: var(--dv-icon-hover-background-color);
+            }
+        }
+    }
 }
diff --git a/packages/dockview-core/src/dockview/components/watermark/watermark.ts b/packages/dockview-core/src/dockview/components/watermark/watermark.ts
index 2a2fe49d5..a726c7bb3 100644
--- a/packages/dockview-core/src/dockview/components/watermark/watermark.ts
+++ b/packages/dockview-core/src/dockview/components/watermark/watermark.ts
@@ -1,5 +1,4 @@
 import { GroupPanelPartInitParameters, IWatermarkRenderer } from '../../types';
-import { ActionContainer } from '../../../actionbar/actionsContainer';
 import { addDisposableListener } from '../../../events';
 import { toggleClass } from '../../../dom';
 import { CompositeDisposable } from '../../../lifecycle';
@@ -36,15 +35,17 @@ export class Watermark
         this._element.appendChild(title);
         this._element.appendChild(content);
 
-        const actions = new ActionContainer();
-        title.appendChild(emptySpace);
-        title.appendChild(actions.element);
+        const actionsContainer = document.createElement('div');
+        actionsContainer.className = 'actions-container';
 
         const closeAnchor = document.createElement('div');
         closeAnchor.className = 'close-action';
         closeAnchor.appendChild(createCloseButton());
 
-        actions.add(closeAnchor);
+        actionsContainer.appendChild(closeAnchor);
+
+        title.appendChild(emptySpace);
+        title.appendChild(actionsContainer);
 
         this.addDisposables(
             addDisposableListener(closeAnchor, 'click', (ev) => {
diff --git a/packages/dockview-core/src/dockview/dockviewComponent.ts b/packages/dockview-core/src/dockview/dockviewComponent.ts
index 8c549b632..4ecd85e6b 100644
--- a/packages/dockview-core/src/dockview/dockviewComponent.ts
+++ b/packages/dockview-core/src/dockview/dockviewComponent.ts
@@ -35,7 +35,7 @@ import {
     toTarget,
 } from '../gridview/baseComponentGridview';
 import { DockviewApi } from '../api/component.api';
-import { Orientation, Sizing } from '../splitview/core/splitview';
+import { Orientation, Sizing } from '../splitview/splitview';
 import {
     GroupOptions,
     GroupPanelViewState,
diff --git a/packages/dockview-core/src/dockview/options.ts b/packages/dockview-core/src/dockview/options.ts
index 52a29ad0d..1594249bf 100644
--- a/packages/dockview-core/src/dockview/options.ts
+++ b/packages/dockview-core/src/dockview/options.ts
@@ -12,7 +12,7 @@ import {
     DockviewGroupPanel,
     DockviewGroupPanelApi,
 } from './dockviewGroupPanel';
-import { ISplitviewStyles, Orientation } from '../splitview/core/splitview';
+import { ISplitviewStyles, Orientation } from '../splitview/splitview';
 import { FrameworkFactory } from '../types';
 import { PanelTransfer } from '../dnd/dataTransfer';
 import { IDisposable } from '../lifecycle';
diff --git a/packages/dockview-core/src/gridview/baseComponentGridview.ts b/packages/dockview-core/src/gridview/baseComponentGridview.ts
index 9fbb82a2b..9c6e6b4de 100644
--- a/packages/dockview-core/src/gridview/baseComponentGridview.ts
+++ b/packages/dockview-core/src/gridview/baseComponentGridview.ts
@@ -3,11 +3,7 @@ import { getGridLocation, Gridview, IGridView } from './gridview';
 import { Position } from '../dnd/droptarget';
 import { CompositeDisposable, IValueDisposable } from '../lifecycle';
 import { sequentialNumberGenerator } from '../math';
-import {
-    ISplitviewStyles,
-    Orientation,
-    Sizing,
-} from '../splitview/core/splitview';
+import { ISplitviewStyles, Orientation, Sizing } from '../splitview/splitview';
 import { IPanel } from '../panel/types';
 import { MovementOptions2 } from '../dockview/options';
 
diff --git a/packages/dockview-core/src/gridview/branchNode.ts b/packages/dockview-core/src/gridview/branchNode.ts
index 7e91187a6..c97e33243 100644
--- a/packages/dockview-core/src/gridview/branchNode.ts
+++ b/packages/dockview-core/src/gridview/branchNode.ts
@@ -10,7 +10,7 @@ import {
     Sizing,
     LayoutPriority,
     ISplitviewStyles,
-} from '../splitview/core/splitview';
+} from '../splitview/splitview';
 import { Emitter, Event } from '../events';
 import { INodeDescriptor } from './gridview';
 import { LeafNode } from './leafNode';
diff --git a/packages/dockview-core/src/gridview/gridview.ts b/packages/dockview-core/src/gridview/gridview.ts
index 5afce5c12..2e45405c1 100644
--- a/packages/dockview-core/src/gridview/gridview.ts
+++ b/packages/dockview-core/src/gridview/gridview.ts
@@ -8,7 +8,7 @@ import {
     LayoutPriority,
     Orientation,
     Sizing,
-} from '../splitview/core/splitview';
+} from '../splitview/splitview';
 import { tail } from '../array';
 import { LeafNode } from './leafNode';
 import { BranchNode } from './branchNode';
diff --git a/packages/dockview-core/src/gridview/gridviewComponent.ts b/packages/dockview-core/src/gridview/gridviewComponent.ts
index c6b8d45df..13651be30 100644
--- a/packages/dockview-core/src/gridview/gridviewComponent.ts
+++ b/packages/dockview-core/src/gridview/gridviewComponent.ts
@@ -22,7 +22,7 @@ import {
     IGridviewPanel,
 } from './gridviewPanel';
 import { BaseComponentOptions } from '../panel/types';
-import { Orientation, Sizing } from '../splitview/core/splitview';
+import { Orientation, Sizing } from '../splitview/splitview';
 import { createComponent } from '../panel/componentFactory';
 import { Emitter, Event } from '../events';
 import { Position } from '../dnd/droptarget';
diff --git a/packages/dockview-core/src/gridview/gridviewPanel.ts b/packages/dockview-core/src/gridview/gridviewPanel.ts
index 81ed2e4dc..8ea379901 100644
--- a/packages/dockview-core/src/gridview/gridviewPanel.ts
+++ b/packages/dockview-core/src/gridview/gridviewPanel.ts
@@ -13,7 +13,7 @@ import {
     GridviewPanelApi,
     GridviewPanelApiImpl,
 } from '../api/gridviewPanelApi';
-import { LayoutPriority } from '../splitview/core/splitview';
+import { LayoutPriority } from '../splitview/splitview';
 import { Emitter, Event } from '../events';
 import { IViewSize } from './gridview';
 
diff --git a/packages/dockview-core/src/gridview/leafNode.ts b/packages/dockview-core/src/gridview/leafNode.ts
index 02f3469d0..3abdb57ea 100644
--- a/packages/dockview-core/src/gridview/leafNode.ts
+++ b/packages/dockview-core/src/gridview/leafNode.ts
@@ -3,11 +3,7 @@
  * https://github.com/microsoft/vscode/tree/main/src/vs/base/browser/ui/grid
  *--------------------------------------------------------------------------------------------*/
 
-import {
-    IView,
-    LayoutPriority,
-    Orientation,
-} from '../splitview/core/splitview';
+import { IView, LayoutPriority, Orientation } from '../splitview/splitview';
 import { Emitter, Event } from '../events';
 import { IGridView } from './gridview';
 import { IDisposable } from '../lifecycle';
diff --git a/packages/dockview-core/src/gridview/options.ts b/packages/dockview-core/src/gridview/options.ts
index 86530f0f7..c224a73b4 100644
--- a/packages/dockview-core/src/gridview/options.ts
+++ b/packages/dockview-core/src/gridview/options.ts
@@ -1,5 +1,5 @@
 import { GridviewPanel } from './gridviewPanel';
-import { ISplitviewStyles, Orientation } from '../splitview/core/splitview';
+import { ISplitviewStyles, Orientation } from '../splitview/splitview';
 import { FrameworkFactory } from '../types';
 
 export interface GridviewComponentOptions {
diff --git a/packages/dockview-core/src/index.ts b/packages/dockview-core/src/index.ts
index 71347bb1c..fb7052653 100644
--- a/packages/dockview-core/src/index.ts
+++ b/packages/dockview-core/src/index.ts
@@ -18,8 +18,8 @@ export {
 export * from './panel/types';
 export * from './panel/componentFactory';
 
-export * from './splitview/core/splitview';
-export * from './splitview/core/options';
+export * from './splitview/splitview';
+export * from './splitview/options';
 
 export * from './paneview/paneview';
 export * from './gridview/gridview';
diff --git a/packages/dockview-core/src/panel/types.ts b/packages/dockview-core/src/panel/types.ts
index ed536ada6..98905e110 100644
--- a/packages/dockview-core/src/panel/types.ts
+++ b/packages/dockview-core/src/panel/types.ts
@@ -1,5 +1,5 @@
 import { IDisposable } from '../lifecycle';
-import { LayoutPriority } from '../splitview/core/splitview';
+import { LayoutPriority } from '../splitview/splitview';
 
 /**
  * A key-value object of anything that is a valid JavaScript Object.
diff --git a/packages/dockview-core/src/paneview/draggablePaneviewPanel.ts b/packages/dockview-core/src/paneview/draggablePaneviewPanel.ts
index bb141b686..b86c06d33 100644
--- a/packages/dockview-core/src/paneview/draggablePaneviewPanel.ts
+++ b/packages/dockview-core/src/paneview/draggablePaneviewPanel.ts
@@ -8,7 +8,7 @@ import {
 import { Droptarget, DroptargetEvent } from '../dnd/droptarget';
 import { Emitter } from '../events';
 import { IDisposable } from '../lifecycle';
-import { Orientation } from '../splitview/core/splitview';
+import { Orientation } from '../splitview/splitview';
 import { IPaneviewComponent } from './paneviewComponent';
 import {
     IPaneviewPanel,
diff --git a/packages/dockview-core/src/paneview/paneview.ts b/packages/dockview-core/src/paneview/paneview.ts
index aa085d446..65666bdb7 100644
--- a/packages/dockview-core/src/paneview/paneview.ts
+++ b/packages/dockview-core/src/paneview/paneview.ts
@@ -3,7 +3,7 @@ import {
     Orientation,
     ISplitViewDescriptor,
     Sizing,
-} from '../splitview/core/splitview';
+} from '../splitview/splitview';
 import { CompositeDisposable, IDisposable } from '../lifecycle';
 import { Emitter, Event } from '../events';
 import { addClasses, removeClasses } from '../dom';
diff --git a/packages/dockview-core/src/paneview/paneviewComponent.ts b/packages/dockview-core/src/paneview/paneviewComponent.ts
index 07e2576bd..50d8ae307 100644
--- a/packages/dockview-core/src/paneview/paneviewComponent.ts
+++ b/packages/dockview-core/src/paneview/paneviewComponent.ts
@@ -6,11 +6,7 @@ import {
     IDisposable,
     MutableDisposable,
 } from '../lifecycle';
-import {
-    LayoutPriority,
-    Orientation,
-    Sizing,
-} from '../splitview/core/splitview';
+import { LayoutPriority, Orientation, Sizing } from '../splitview/splitview';
 import { PaneviewComponentOptions } from './options';
 import { Paneview } from './paneview';
 import {
diff --git a/packages/dockview-core/src/paneview/paneviewPanel.ts b/packages/dockview-core/src/paneview/paneviewPanel.ts
index 951db8ebd..bfbda79c8 100644
--- a/packages/dockview-core/src/paneview/paneviewPanel.ts
+++ b/packages/dockview-core/src/paneview/paneviewPanel.ts
@@ -14,7 +14,7 @@ import {
     PanelUpdateEvent,
     Parameters,
 } from '../panel/types';
-import { IView, Orientation } from '../splitview/core/splitview';
+import { IView, Orientation } from '../splitview/splitview';
 
 export interface PanePanelViewState extends BasePanelViewState {
     headerComponent?: string;
diff --git a/packages/dockview-core/src/splitview/core/options.ts b/packages/dockview-core/src/splitview/options.ts
similarity index 76%
rename from packages/dockview-core/src/splitview/core/options.ts
rename to packages/dockview-core/src/splitview/options.ts
index 05d01864f..05c492e4c 100644
--- a/packages/dockview-core/src/splitview/core/options.ts
+++ b/packages/dockview-core/src/splitview/options.ts
@@ -1,8 +1,8 @@
-import { IPanel, PanelInitParameters } from '../../panel/types';
+import { IPanel, PanelInitParameters } from '../panel/types';
 import { IView, SplitViewOptions, LayoutPriority } from './splitview';
-import { FrameworkFactory } from '../../types';
-import { SplitviewPanel } from '../splitviewPanel';
-import { SplitviewComponent } from '../splitviewComponent';
+import { FrameworkFactory } from '../types';
+import { SplitviewPanel } from './splitviewPanel';
+import { SplitviewComponent } from './splitviewComponent';
 
 export interface PanelViewInitParameters extends PanelInitParameters {
     minimumSize?: number;
diff --git a/packages/dockview-core/src/splitview/core/splitview.scss b/packages/dockview-core/src/splitview/splitview.scss
similarity index 100%
rename from packages/dockview-core/src/splitview/core/splitview.scss
rename to packages/dockview-core/src/splitview/splitview.scss
diff --git a/packages/dockview-core/src/splitview/core/splitview.ts b/packages/dockview-core/src/splitview/splitview.ts
similarity index 99%
rename from packages/dockview-core/src/splitview/core/splitview.ts
rename to packages/dockview-core/src/splitview/splitview.ts
index e4f6f004b..7925bd578 100644
--- a/packages/dockview-core/src/splitview/core/splitview.ts
+++ b/packages/dockview-core/src/splitview/splitview.ts
@@ -8,10 +8,10 @@ import {
     addClasses,
     toggleClass,
     getElementsByTagName,
-} from '../../dom';
-import { clamp } from '../../math';
-import { Event, Emitter } from '../../events';
-import { pushToStart, pushToEnd, range, firstIndex } from '../../array';
+} from '../dom';
+import { clamp } from '../math';
+import { Event, Emitter } from '../events';
+import { pushToStart, pushToEnd, range, firstIndex } from '../array';
 import { ViewItem } from './viewItem';
 
 export enum Orientation {
diff --git a/packages/dockview-core/src/splitview/splitviewComponent.ts b/packages/dockview-core/src/splitview/splitviewComponent.ts
index 1fb23846b..e5ebf74b9 100644
--- a/packages/dockview-core/src/splitview/splitviewComponent.ts
+++ b/packages/dockview-core/src/splitview/splitviewComponent.ts
@@ -10,8 +10,8 @@ import {
     Orientation,
     Sizing,
     Splitview,
-} from './core/splitview';
-import { SplitviewComponentOptions } from './core/options';
+} from './splitview';
+import { SplitviewComponentOptions } from './options';
 import { BaseComponentOptions } from '../panel/types';
 import { Emitter, Event } from '../events';
 import { SplitviewPanel, ISplitviewPanel } from './splitviewPanel';
diff --git a/packages/dockview-core/src/splitview/splitviewPanel.ts b/packages/dockview-core/src/splitview/splitviewPanel.ts
index 1fc66f03b..4782e8c30 100644
--- a/packages/dockview-core/src/splitview/splitviewPanel.ts
+++ b/packages/dockview-core/src/splitview/splitviewPanel.ts
@@ -1,10 +1,10 @@
-import { ISerializableView, PanelViewInitParameters } from './core/options';
+import { ISerializableView, PanelViewInitParameters } from './options';
 import {
     BasePanelView,
     BasePanelViewExported,
 } from '../gridview/basePanelView';
 import { SplitviewPanelApiImpl } from '../api/splitviewPanelApi';
-import { LayoutPriority, Orientation } from './core/splitview';
+import { LayoutPriority, Orientation } from './splitview';
 import { FunctionOrValue } from '../types';
 import { Emitter, Event } from '../events';
 
diff --git a/packages/dockview-core/src/splitview/core/viewItem.ts b/packages/dockview-core/src/splitview/viewItem.ts
similarity index 96%
rename from packages/dockview-core/src/splitview/core/viewItem.ts
rename to packages/dockview-core/src/splitview/viewItem.ts
index b440da073..f5078f4ff 100644
--- a/packages/dockview-core/src/splitview/core/viewItem.ts
+++ b/packages/dockview-core/src/splitview/viewItem.ts
@@ -1,5 +1,5 @@
-import { IDisposable } from '../../lifecycle';
-import { clamp } from '../../math';
+import { IDisposable } from '../lifecycle';
+import { clamp } from '../math';
 import { IView, LayoutPriority } from './splitview';
 
 export class ViewItem {
diff --git a/packages/dockview/src/dockview/reactContentPart.ts b/packages/dockview/src/dockview/reactContentPart.ts
index 6a9a3a9a4..e98137c7d 100644
--- a/packages/dockview/src/dockview/reactContentPart.ts
+++ b/packages/dockview/src/dockview/reactContentPart.ts
@@ -4,7 +4,6 @@ import { IDockviewPanelProps } from '../dockview/dockview';
 import {
     DockviewEmitter,
     DockviewEvent,
-    DockviewGroupPanel,
     PanelUpdateEvent,
     IContentRenderer,
     GroupPanelContentPartInitParameters,
diff --git a/packages/dockview/src/dockview/reactHeaderPart.ts b/packages/dockview/src/dockview/reactHeaderPart.ts
index dd817e4ab..133416beb 100644
--- a/packages/dockview/src/dockview/reactHeaderPart.ts
+++ b/packages/dockview/src/dockview/reactHeaderPart.ts
@@ -3,7 +3,6 @@ import { ReactPart, ReactPortalStore } from '../react';
 import { IGroupPanelBaseProps } from './dockview';
 import {
     PanelUpdateEvent,
-    DockviewGroupPanel,
     ITabRenderer,
     GroupPanelPartInitParameters,
 } from 'dockview-core';
diff --git a/packages/dockview/src/dockview/v2/reactContentRenderer.ts b/packages/dockview/src/dockview/v2/reactContentRenderer.ts
deleted file mode 100644
index 758c41325..000000000
--- a/packages/dockview/src/dockview/v2/reactContentRenderer.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import {
-    GroupPanelPartInitParameters,
-    IContentRenderer,
-    DockviewGroupPanel,
-    HostedContainer,
-    PanelUpdateEvent,
-    DockviewEvent,
-} from 'dockview-core';
-import { ReactPart, ReactPortalStore } from '../../react';
-import { IDockviewPanelProps } from '../dockview';
-
-export class ReactContentRenderer implements IContentRenderer {
-    private _hostedContainer: HostedContainer;
-    private _element: HTMLElement;
-    private part?: ReactPart<IDockviewPanelProps>;
-    private parameters: GroupPanelPartInitParameters | undefined;
-
-    get element(): HTMLElement {
-        return this._element;
-    }
-
-    get onDidBlur(): DockviewEvent<void> {
-        return this._hostedContainer.onDidBlur;
-    }
-
-    get onDidFocus(): DockviewEvent<void> {
-        return this._hostedContainer.onDidFocus;
-    }
-
-    constructor(
-        public readonly id: string,
-        private readonly component: React.FunctionComponent<IDockviewPanelProps>,
-        private readonly reactPortalStore: ReactPortalStore
-    ) {
-        this._hostedContainer = new HostedContainer({
-            id,
-            parent: document
-                .getElementsByClassName('dockview')
-                .item(0) as HTMLElement,
-        });
-
-        this._element = document.createElement('div');
-        this._element.style.height = '100%';
-        this._element.style.width = '100%';
-    }
-
-    focus(): void {
-        // noop
-    }
-
-    public init(parameters: GroupPanelPartInitParameters): void {
-        this.parameters = parameters;
-
-        parameters.api.onDidVisibilityChange((event) => {
-            if (event.isVisible) {
-                this._hostedContainer.show();
-                this._hostedContainer.layout(this.element);
-            } else {
-                this._hostedContainer.hide();
-            }
-        });
-
-        this.part = new ReactPart(
-            this._hostedContainer.element,
-            this.reactPortalStore,
-            this.component,
-            {
-                params: parameters.params,
-                api: parameters.api,
-                containerApi: parameters.containerApi,
-            }
-        );
-    }
-
-    public update(params: PanelUpdateEvent): void {
-        if (this.parameters) {
-            this.parameters.params = params.params;
-        }
-
-        this.part?.update(params.params);
-    }
-
-    public layout(_width: number, _height: number): void {
-        this._hostedContainer.layout(this.element);
-    }
-
-    public dispose(): void {
-        this.part?.dispose();
-    }
-}
diff --git a/packages/dockview/src/dockview/v2/webviewContentRenderer.ts b/packages/dockview/src/dockview/v2/webviewContentRenderer.ts
deleted file mode 100644
index f366a2e06..000000000
--- a/packages/dockview/src/dockview/v2/webviewContentRenderer.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {
-    GroupPanelPartInitParameters,
-    IContentRenderer,
-    DockviewGroupPanel,
-    HostedContainer,
-    PanelUpdateEvent,
-} from 'dockview-core';
-
-export class WebviewContentRenderer implements IContentRenderer {
-    private _hostedContainer: HostedContainer;
-    private _element: HTMLElement;
-    private parameters: GroupPanelPartInitParameters | undefined;
-
-    get element(): HTMLElement {
-        return this._element;
-    }
-
-    constructor(public readonly id: string) {
-        this._hostedContainer = new HostedContainer({ id });
-
-        this._element = document.createElement('div');
-        this._element.style.height = '100%';
-        this._element.style.width = '100%';
-    }
-
-    focus(): void {
-        // noop
-    }
-
-    public init(parameters: GroupPanelPartInitParameters): void {
-        this.parameters = parameters;
-    }
-
-    public update(params: PanelUpdateEvent): void {
-        if (this.parameters) {
-            this.parameters.params = params.params;
-        }
-    }
-
-    public layout(_width: number, _height: number): void {
-        this._hostedContainer.layout(this._element);
-    }
-
-    public dispose(): void {
-        //
-    }
-}