diff --git a/core.multiview/src/org/netbeans/core/multiview/SplitAction.java b/core.multiview/src/org/netbeans/core/multiview/SplitAction.java
index a359e1f..fd0dc99 100644
--- a/core.multiview/src/org/netbeans/core/multiview/SplitAction.java
+++ b/core.multiview/src/org/netbeans/core/multiview/SplitAction.java
@@ -1,250 +1,174 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2013 Sun Microsystems, Inc.
- */
-package org.netbeans.core.multiview;
-
-import java.awt.event.ActionEvent;
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
-import java.util.Map;
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.JComponent;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JSplitPane;
-import javax.swing.SwingUtilities;
-import org.openide.awt.DynamicMenuContent;
-import org.openide.awt.Mnemonics;
-import org.openide.util.NbBundle;
-import org.openide.util.NbBundle.Messages;
-import org.openide.util.actions.Presenter;
-import org.openide.windows.TopComponent;
-import org.openide.windows.WindowManager;
-
-/**
- * Action to show in main menu to split document.
- *
- * @author Th. Oikonomou
- */
-@Messages({"CTL_SplitDocumentAction=&Split Document", "CTL_SplitAction=&Split", "MultiViewElement.Spliting.Enabled=true"})
-public class SplitAction extends AbstractAction implements Presenter.Menu, Presenter.Popup {
-
-    boolean useSplitName = false;
-
-    public SplitAction() {
-	super(Bundle.CTL_SplitDocumentAction());
-    }
-
-    public SplitAction(boolean useSplitName) {
-	super(Bundle.CTL_SplitDocumentAction());
-	this.useSplitName = useSplitName;
-    }
-
-    static Action createSplitAction(Map map) {
-	if(!isSplitingEnabled()) {
-	    return null;
-	}
-	Object nameObj = map.get("displayName"); //NOI18N
-	if (nameObj == null) {
-	    return null;
-	}
-	return new SplitAction(nameObj.toString().equals(Bundle.CTL_SplitAction()));
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent ev) {
-	assert false;
-    }
-
-    @Override
-    public JMenuItem getMenuPresenter() {
-	return getSplitMenuItem();
-    }
-
-    @Override
-    public JMenuItem getPopupPresenter() {
-	return getSplitMenuItem();
-    }
-    
-    private JMenuItem getSplitMenuItem() {
-	if(!isSplitingEnabled()) {
-	    return null;
-	}
-	JMenu menu = new SplitAction.UpdatingMenu();
-	String label = useSplitName ? Bundle.CTL_SplitAction() : Bundle.CTL_SplitDocumentAction();
-	Mnemonics.setLocalizedText(menu, label);
-	return menu;
-    }
-
-    static boolean isSplitingEnabled() {
-	boolean splitingEnabled = "true".equals(Bundle.MultiViewElement_Spliting_Enabled()); // NOI18N
-	return splitingEnabled;
-    }
-
-    private static final class UpdatingMenu extends JMenu implements DynamicMenuContent {
-
-	@Override
-	public JComponent[] synchMenuPresenters(JComponent[] items) {
-	    return getMenuPresenters();
-	}
-
-	@Override
-	public JComponent[] getMenuPresenters() {
-	    assert SwingUtilities.isEventDispatchThread() : "Must be called from AWT";
-	    removeAll();
-	    final TopComponent tc = WindowManager.getDefault().getRegistry().getActivated();
-	    if (tc != null) {
-		setEnabled(true);
-		if (tc instanceof Splitable && ((Splitable)tc).canSplit()) {
-		    JMenuItem item = new JMenuItem(new SplitDocumentAction(tc, JSplitPane.VERTICAL_SPLIT));
-		    Mnemonics.setLocalizedText(item, item.getText());
-		    add(item);
-		    item = new JMenuItem(new SplitDocumentAction(tc, JSplitPane.HORIZONTAL_SPLIT));
-		    Mnemonics.setLocalizedText(item, item.getText());
-		    add(item);
-		    item = new JMenuItem(new ClearSplitAction(tc));
-		    Mnemonics.setLocalizedText(item, item.getText());
-		    add(item);
-		} else { // tc is not splitable
-		    //No reason to enable action on any TC because now it was enabled even for Welcome page
-		    setEnabled(false);
-		    /*JRadioButtonMenuItem but = new JRadioButtonMenuItem();
-		     Mnemonics.setLocalizedText(but, NbBundle.getMessage(EditorsAction.class, "EditorsAction.source"));
-		     but.setSelected(true);
-		     add(but);*/
-		}
-	    } else { // tc == null
-		setEnabled(false);
-	    }
-	    return new JComponent[]{this};
-	}
-    }
-
-    @NbBundle.Messages({"LBL_SplitDocumentActionVertical=&Vertically",
-	"LBL_SplitDocumentActionHorizontal=&Horizontally",
-	"LBL_ValueSplitVertical=splitVertically",
-	"LBL_ValueSplitHorizontal=splitHorizontally"})
-    private static class SplitDocumentAction extends AbstractAction {
-
-	private final Reference<TopComponent> tcRef;
-	private final int orientation;
-
-	public SplitDocumentAction(TopComponent tc, int orientation) {
-            // Replaced by weak ref since strong ref led to leaking of editor panes
-	    this.tcRef = new WeakReference<TopComponent>(tc);
-	    this.orientation = orientation;
-	    putValue(Action.NAME, orientation == JSplitPane.VERTICAL_SPLIT ? Bundle.LBL_SplitDocumentActionVertical() : Bundle.LBL_SplitDocumentActionHorizontal());
-	    //hack to insert extra actions into JDev's popup menu
-	    putValue("_nb_action_id_", orientation == JSplitPane.VERTICAL_SPLIT ? Bundle.LBL_ValueSplitVertical() : Bundle.LBL_ValueSplitHorizontal()); //NOI18N
-	    if (tc instanceof Splitable) {
-                int split = ((Splitable)tc).getSplitOrientation();
-		setEnabled( split == -1 || split != orientation );
-	    } else {
-		setEnabled(false);
-	    }
-	}
-
-	@Override
-	public void actionPerformed(ActionEvent evt) {
-            TopComponent tc = tcRef.get();
-            if (tc != null) {
-                splitWindow(tc, orientation);
-            }
-	}
-    }
-
-    @NbBundle.Messages({"LBL_ClearSplitAction=&Clear",
-	"LBL_ValueClearSplit=clearSplit"})
-    private static class ClearSplitAction extends AbstractAction {
-
-	private final Reference<TopComponent> tcRef;
-
-	public ClearSplitAction(TopComponent tc) {
-            // Replaced by weak ref since strong ref led to leaking of editor panes
-	    this.tcRef = new WeakReference<TopComponent>(tc);
-	    putValue(Action.NAME, Bundle.LBL_ClearSplitAction());
-	    //hack to insert extra actions into JDev's popup menu
-	    putValue("_nb_action_id_", Bundle.LBL_ValueClearSplit()); //NOI18N
-	    if (tc instanceof Splitable) {
-		setEnabled(((Splitable) tc).getSplitOrientation() != -1);
-	    } else {
-		setEnabled(false);
-	    }
-	}
-
-	@Override
-	public void actionPerformed(ActionEvent evt) {
-            TopComponent tc = tcRef.get();
-            if (tc != null) {
-                clearSplit(tc, -1);
-            }
-	}
-    }
-
-    static void splitWindow(TopComponent tc, int orientation) {
-	splitWindow( tc, orientation, -1 );
-    }
-
-    static void splitWindow(TopComponent tc, int orientation, int splitLocation) {
-	if (tc instanceof Splitable) {
-	    TopComponent split = ((Splitable) tc).splitComponent(orientation, splitLocation);
-	    split.open();
-	    split.requestActive();
-            split.invalidate();
-            split.revalidate();
-            split.repaint();
-            split.requestFocusInWindow();
-	}
-    }
-
-    static void clearSplit(TopComponent tc, int elementToActivate) {
-	if (tc instanceof Splitable) {
-	    TopComponent original = ((Splitable) tc).clearSplit(elementToActivate);
-	    original.open();
-	    original.requestActive();
-            original.invalidate();
-            original.revalidate();
-            original.repaint();
-            original.requestFocusInWindow();
-	}
-    }
-}
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2013 Sun Microsystems, Inc.
+ */
+package org.netbeans.core.multiview;
+
+import org.netbeans.core.multiview.actions.ClearSplitAction;
+import java.awt.event.ActionEvent;
+import java.util.Map;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JComponent;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+import org.netbeans.core.multiview.actions.SplitDocumentAction;
+import org.netbeans.core.multiview.actions.SplitDocumentHorizontallyAction;
+import org.netbeans.core.multiview.actions.SplitDocumentVerticallyAction;
+import org.openide.awt.DynamicMenuContent;
+import org.openide.awt.Mnemonics;
+import org.openide.util.NbBundle.Messages;
+import org.openide.util.actions.Presenter;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
+
+/**
+ * Action to show in main menu to split document.
+ *
+ * @author Th. Oikonomou
+ */
+@Messages({"CTL_SplitDocumentAction=&Split Document", "CTL_SplitAction=&Split", "MultiViewElement.Spliting.Enabled=true"})
+public class SplitAction extends AbstractAction implements Presenter.Menu, Presenter.Popup {
+
+    boolean useSplitName = false;
+
+    public SplitAction() {
+	super(Bundle.CTL_SplitDocumentAction());
+    }
+
+    public SplitAction(boolean useSplitName) {
+	super(Bundle.CTL_SplitDocumentAction());
+	this.useSplitName = useSplitName;
+    }
+
+    static Action createSplitAction(Map map) {
+	if(!isSplitingEnabled()) {
+	    return null;
+	}
+	Object nameObj = map.get("displayName"); //NOI18N
+	if (nameObj == null) {
+	    return null;
+	}
+	return new SplitAction(nameObj.toString().equals(Bundle.CTL_SplitAction()));
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent ev) {
+	assert false;
+    }
+
+    @Override
+    public JMenuItem getMenuPresenter() {
+	return getSplitMenuItem();
+    }
+
+    @Override
+    public JMenuItem getPopupPresenter() {
+	return getSplitMenuItem();
+    }
+    
+    private JMenuItem getSplitMenuItem() {
+	if(!isSplitingEnabled()) {
+	    return null;
+	}
+	JMenu menu = new SplitAction.UpdatingMenu();
+	String label = useSplitName ? Bundle.CTL_SplitAction() : Bundle.CTL_SplitDocumentAction();
+	Mnemonics.setLocalizedText(menu, label);
+	return menu;
+    }
+
+    static boolean isSplitingEnabled() {
+	boolean splitingEnabled = "true".equals(Bundle.MultiViewElement_Spliting_Enabled()); // NOI18N
+	return splitingEnabled;
+    }
+
+    private static final class UpdatingMenu extends JMenu implements DynamicMenuContent {
+
+	@Override
+	public JComponent[] synchMenuPresenters(JComponent[] items) {
+	    return getMenuPresenters();
+	}
+
+	@Override
+	public JComponent[] getMenuPresenters() {
+	    assert SwingUtilities.isEventDispatchThread() : "Must be called from AWT";
+	    removeAll();
+	    final TopComponent tc = WindowManager.getDefault().getRegistry().getActivated();
+	    if (tc != null) {
+		setEnabled(true);
+		if (tc instanceof Splitable && ((Splitable)tc).canSplit()) {
+                                 SplitDocumentVerticallyAction verticalSplitAction = new SplitDocumentVerticallyAction();
+                                 verticalSplitAction.initTopComponent(tc, JSplitPane.VERTICAL_SPLIT);
+                    
+		    JMenuItem item = new JMenuItem(verticalSplitAction);
+		    Mnemonics.setLocalizedText(item, item.getText());
+		    add(item);
+                    
+                                 SplitDocumentHorizontallyAction horizontalSplitAction = new SplitDocumentHorizontallyAction();
+                                 horizontalSplitAction.initTopComponent(tc, JSplitPane.HORIZONTAL_SPLIT);
+                                        
+		    item = new JMenuItem(horizontalSplitAction);
+		    Mnemonics.setLocalizedText(item, item.getText());
+		    add(item);
+                                
+                                ClearSplitAction clearSplitAction = new ClearSplitAction();
+                                clearSplitAction.initTopComponent(tc);
+                    
+		    item = new JMenuItem(clearSplitAction);
+                    
+		    Mnemonics.setLocalizedText(item, item.getText());
+		    add(item);
+		} else { // tc is not splitable
+		    //No reason to enable action on any TC because now it was enabled even for Welcome page
+		    setEnabled(false);
+		    /*JRadioButtonMenuItem but = new JRadioButtonMenuItem();
+		     Mnemonics.setLocalizedText(but, NbBundle.getMessage(EditorsAction.class, "EditorsAction.source"));
+		     but.setSelected(true);
+		     add(but);*/
+		}
+	    } else { // tc == null
+		setEnabled(false);
+	    }
+	    return new JComponent[]{this};
+	}
+    }
+}
diff --git a/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java b/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java
index b9ac62a..a30fd7e 100644
--- a/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java
+++ b/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java
@@ -57,6 +57,7 @@
 import javax.swing.JSplitPane;
 import javax.swing.SwingUtilities;
 import javax.swing.plaf.LayerUI;
+import org.netbeans.core.multiview.actions.SplitDocumentAction;
 import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 import org.openide.windows.TopComponent;
@@ -116,7 +117,7 @@
                         @Override
                         public void run() {
                             TopComponent tc = (TopComponent)SwingUtilities.getAncestorOfClass( TopComponent.class, content );
-                            SplitAction.splitWindow( tc, orientation, splitLocation );
+                            SplitDocumentAction.splitWindow( tc, orientation, splitLocation );
                         }
                     });
                 } else if( event.getID() == KeyEvent.KEY_PRESSED || event.getID() == KeyEvent.KEY_RELEASED ) {
diff --git a/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java b/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java
index 531df97..95878fa 100644
--- a/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java
+++ b/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java
@@ -56,6 +56,7 @@
 import javax.swing.KeyStroke;
 import javax.swing.border.Border;
 import javax.swing.plaf.basic.BasicSplitPaneDivider;
+import org.netbeans.core.multiview.actions.ClearSplitAction;
 import org.netbeans.core.spi.multiview.MultiViewDescription;
 import org.netbeans.core.spi.multiview.MultiViewElement;
 import org.openide.awt.Actions;
@@ -478,7 +479,7 @@
                             int toActivate = 0;
                             if( splitPane.getDividerLocation() < 10 )
                                 toActivate = 1;
-                            SplitAction.clearSplit( tc, toActivate );
+                            ClearSplitAction.clearSplit( tc, toActivate );
                         }
 		    }
                 }
diff --git a/core.multiview/src/org/netbeans/core/multiview/actions/ClearSplitAction.java b/core.multiview/src/org/netbeans/core/multiview/actions/ClearSplitAction.java
new file mode 100644
index 0000000..abbe022
--- /dev/null
+++ b/core.multiview/src/org/netbeans/core/multiview/actions/ClearSplitAction.java
@@ -0,0 +1,102 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ */
+package org.netbeans.core.multiview.actions;
+
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import org.netbeans.core.multiview.Splitable;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionRegistration;
+import org.openide.util.NbBundle;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
+
+/**
+ *
+ * @author Chris2011
+ */
+@ActionID(
+        category = "Tools",
+        id = "org.netbeans.core.multiview.ClearSplitAction"
+)
+@ActionRegistration(
+        displayName = "#LBL_ClearSplitAction"
+)
+@ActionReference(path = "Shortcuts", name = "DOS-C")
+@NbBundle.Messages({
+    "LBL_ClearSplitAction=&Clear",
+    "LBL_ValueClearSplit=clearSplit"
+})
+public final class ClearSplitAction extends AbstractAction {
+
+    public void initTopComponent(TopComponent tc) {
+        putValue(Action.NAME, Bundle.LBL_ClearSplitAction());
+        //hack to insert extra actions into JDev's popup menu
+        putValue("_nb_action_id_", Bundle.LBL_ValueClearSplit()); //NOI18N
+        if (tc instanceof Splitable) {
+            setEnabled(((Splitable) tc).getSplitOrientation() != -1);
+        } else {
+            setEnabled(false);
+        }
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent evt) {
+        final TopComponent tc = WindowManager.getDefault().getRegistry().getActivated();
+
+        if (tc != null && ((Splitable) tc).getSplitOrientation() != -1) {
+            clearSplit(tc, -1);
+        }
+    }
+
+    public static void clearSplit(TopComponent tc, int elementToActivate) {
+        if (tc instanceof Splitable) {
+            TopComponent original = ((Splitable) tc).clearSplit(elementToActivate);
+            original.open();
+            original.requestActive();
+            original.invalidate();
+            original.revalidate();
+            original.repaint();
+            original.requestFocusInWindow();
+        }
+    }
+}
diff --git a/core.multiview/src/org/netbeans/core/multiview/actions/SplitDocumentAction.java b/core.multiview/src/org/netbeans/core/multiview/actions/SplitDocumentAction.java
new file mode 100644
index 0000000..f322627
--- /dev/null
+++ b/core.multiview/src/org/netbeans/core/multiview/actions/SplitDocumentAction.java
@@ -0,0 +1,99 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ */
+package org.netbeans.core.multiview.actions;
+
+import java.awt.event.ActionEvent;
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import javax.swing.AbstractAction;
+import org.netbeans.core.multiview.Splitable;
+import org.openide.windows.TopComponent;
+
+/**
+ *
+ * @author Chris2011
+ */
+public class SplitDocumentAction extends AbstractAction {
+
+    private Reference<TopComponent> tcRef;
+    private int orientation;
+
+    protected void setTopComponent(TopComponent tc) {
+        // Replaced by weak ref since strong ref led to leaking of editor panes
+        tcRef = new WeakReference<TopComponent>(tc);
+    }
+
+    protected void setOrientation(int orientation) {
+        this.orientation = orientation;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent evt) {
+    }
+
+    public void splitDocument() {
+        TopComponent tc = tcRef.get();
+
+        if (tc != null) {
+            splitWindow(tc, orientation, -1);
+        }
+    }
+
+    public static void splitWindow(TopComponent tc, int orientation, int splitLocation) {
+        if (tc instanceof Splitable) {
+            TopComponent split = ((Splitable) tc).splitComponent(orientation, splitLocation);
+            split.open();
+            split.requestActive();
+            split.invalidate();
+            split.revalidate();
+            split.repaint();
+            split.requestFocusInWindow();
+        }
+    }
+
+    protected void setTcEnabled(TopComponent tc, int orientation) {
+        if (tc instanceof Splitable) {
+            int split = ((Splitable) tc).getSplitOrientation();
+            setEnabled(split == -1 || split != orientation);
+        } else {
+            setEnabled(false);
+        }
+    }
+}
diff --git a/core.multiview/src/org/netbeans/core/multiview/actions/SplitDocumentHorizontallyAction.java b/core.multiview/src/org/netbeans/core/multiview/actions/SplitDocumentHorizontallyAction.java
new file mode 100644
index 0000000..08935d8
--- /dev/null
+++ b/core.multiview/src/org/netbeans/core/multiview/actions/SplitDocumentHorizontallyAction.java
@@ -0,0 +1,88 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ */
+package org.netbeans.core.multiview.actions;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.Action;
+import javax.swing.JSplitPane;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionRegistration;
+import org.openide.util.NbBundle;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
+
+/**
+ *
+ * @author Chrl
+ */
+@ActionID(
+    category = "Tools",
+    id = "org.netbeans.core.multiview.SplitDocumentHorizontallyAction"
+)
+@ActionRegistration(
+    displayName = "#LBL_ValueSplitHorizontal"
+)
+@ActionReference(path = "Shortcuts", name = "DOS-H")
+@NbBundle.Messages({
+    "LBL_SplitDocumentActionHorizontal=&Horizontally",
+    "LBL_ValueSplitHorizontal=Split horizontally"
+})
+public final class SplitDocumentHorizontallyAction extends SplitDocumentAction implements ActionListener {
+    public void initTopComponent(TopComponent tc, int orientation) {
+        putValue(Action.NAME, Bundle.LBL_SplitDocumentActionHorizontal());
+        //hack to insert extra actions into JDev's popup menu
+        putValue("_nb_action_id_", Bundle.LBL_ValueSplitHorizontal()); //NOI18N
+
+        super.setTcEnabled(tc, orientation);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent evt) {
+        final TopComponent tc = WindowManager.getDefault().getRegistry().getActivated();
+        
+        if (tc != null) {
+            super.setTopComponent(tc);
+            super.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
+            super.splitDocument();
+        }
+    }
+}
\ No newline at end of file
diff --git a/core.multiview/src/org/netbeans/core/multiview/actions/SplitDocumentVerticallyAction.java b/core.multiview/src/org/netbeans/core/multiview/actions/SplitDocumentVerticallyAction.java
new file mode 100644
index 0000000..385971d
--- /dev/null
+++ b/core.multiview/src/org/netbeans/core/multiview/actions/SplitDocumentVerticallyAction.java
@@ -0,0 +1,88 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ */
+package org.netbeans.core.multiview.actions;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.Action;
+import javax.swing.JSplitPane;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionRegistration;
+import org.openide.util.NbBundle;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
+
+/**
+ *
+ * @author Chris2011
+ */
+@ActionID(
+    category = "Tools",
+    id = "org.netbeans.core.multiview.SplitDocumentVerticallyAction"
+)
+@ActionRegistration(
+    displayName = "#LBL_ValueSplitVertical"
+)
+@ActionReference(path = "Shortcuts", name = "DOS-V")
+@NbBundle.Messages({
+    "LBL_SplitDocumentActionVertical=&Vertically",
+    "LBL_ValueSplitVertical=Split vertically"
+})
+public final class SplitDocumentVerticallyAction extends SplitDocumentAction implements ActionListener {    
+    public void initTopComponent(TopComponent tc, int orientation) {
+        putValue(Action.NAME, Bundle.LBL_SplitDocumentActionVertical());
+        //hack to insert extra actions into JDev's popup menu
+        putValue("_nb_action_id_", Bundle.LBL_ValueSplitVertical()); //NOI18N
+        
+        super.setTcEnabled(tc, orientation);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent evt) {
+        final TopComponent tc = WindowManager.getDefault().getRegistry().getActivated();
+        
+        if (tc != null) {
+            super.setTopComponent(tc);
+            super.setOrientation(JSplitPane.VERTICAL_SPLIT);
+            super.splitDocument();
+        }
+    }
+}
\ No newline at end of file