Index: Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj
===================================================================
diff -u -rc34a894787b4281dd3770eacd67436c55575d006 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj	(.../Core.Common.Controls.Swf.csproj)	(revision c34a894787b4281dd3770eacd67436c55575d006)
+++ Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj	(.../Core.Common.Controls.Swf.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -270,6 +270,9 @@
     <Compile Include="TimeSpanEditor.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="TreeViewControls\ITreeNode.cs" />
+    <Compile Include="TreeViewControls\ITreeNodePresenter.cs" />
+    <Compile Include="TreeViewControls\ITreeView.cs" />
     <Compile Include="TreeViewControls\PlaceholderLocation.cs" />
     <Compile Include="TreeViewControls\TreeNode.cs" />
     <Compile Include="TreeViewControls\TreeNodeList.cs" />
Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeNode.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeNode.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeNode.cs	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+
+namespace Core.Common.Controls
+{
+    /// <summary>
+    /// Interface for tree nodes
+    /// </summary>
+    public interface ITreeNode : IDisposable
+    {
+        /// <summary>
+        /// Returns the object bound to this node
+        /// </summary>
+        object Tag { get; set; }
+
+        /// <summary>
+        /// Returns the label for this node
+        /// </summary>
+        string Text { get; set; }
+
+        /// <summary>
+        /// The icon of this node
+        /// </summary>
+        Image Image { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether a check box is displayed next to the node
+        /// </summary>
+        bool ShowCheckBox { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the tree node is in a checked state
+        /// </summary>
+        bool Checked { get; set; }
+
+        /// <summary>
+        /// Node can be hidden in the tree view
+        /// </summary>
+        bool IsVisible { get; set; }
+
+        /// <summary>
+        /// Font bold setting
+        /// </summary>
+        bool Bold { get; set; }
+
+        /// <summary>
+        /// Background color of tree node
+        /// </summary>
+        Color BackgroundColor { set; get; }
+
+        /// <summary>
+        /// Font color of tree node.
+        /// </summary>
+        Color ForegroundColor { set; get; }
+
+        /// <summary>
+        /// The tree view that holds the node
+        /// </summary>
+        ITreeView TreeView { get; }
+
+        /// <summary>
+        /// Node presenter used to visualize this node.
+        /// </summary>
+        ITreeNodePresenter Presenter { get; set; }
+
+        /// <summary>
+        /// Returns a list of child nodes for this node
+        /// </summary>
+        IList<ITreeNode> Nodes { get; }
+
+        /// <summary>
+        /// Parent node of the current node
+        /// </summary>
+        ITreeNode Parent { get; }
+
+        /// <summary>
+        /// Indicates whether child nodes have been created
+        /// </summary>
+        bool IsLoaded { get; }
+
+        /// <summary>
+        /// Drawing bounds of node
+        /// </summary>
+        Rectangle Bounds { get; }
+
+        /// <summary>
+        /// Gets the path from the root node to this node
+        /// </summary>
+        string FullPath { get; }
+
+        /// <summary>
+        /// Previous sibling tree node
+        /// </summary>
+        ITreeNode PreviousNode { get; }
+
+        /// <summary>
+        /// Previous visible tree node
+        /// </summary>
+        ITreeNode PreviousVisibleNode { get; }
+
+        /// <summary>
+        /// Next sibling tree node
+        /// </summary>
+        ITreeNode NextNode { get; }
+
+        /// <summary>
+        /// Next visible tree node
+        /// </summary>
+        ITreeNode NextVisibleNode { get; }
+
+        /// <summary>
+        /// Gets the zero-based depth of the tree node in the TreeView control
+        /// </summary>
+        int Level { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the tree node is in the expanded state
+        /// </summary>
+        bool IsExpanded { get; }
+
+        bool IsUpdating { get; }
+
+        bool IsEditing { get; }
+
+        /// <summary>
+        /// Expands the tree node
+        /// </summary>
+        void Expand();
+
+        /// <summary>
+        /// Collapses the tree node
+        /// </summary>
+        void Collapse(bool ignoreChildren = true);
+
+        /// <summary>
+        /// Updates node and all it's sub-nodes based on their tag properties
+        /// 
+        /// <remarks>
+        /// Use it only in case if you tag objects do not implement INotifyPropertyChanged interface. 
+        /// When object in tag of the root node implements this interface - tree node will call ITreeViewNodePresenter.OnNotifyPropertyChanged()
+        /// </remarks>
+        /// </summary>
+        /// TODO: rename to Refresh(bool refreshChildren = true)
+        void Update();
+
+        /// <summary>
+        /// Initiates the editing of the tree node label
+        /// </summary>
+        void BeginEdit();
+
+        /// <summary>
+        /// Returns child node of the current node by tag
+        /// </summary>
+        /// <param name="item"></param>
+        ITreeNode GetNodeByTag(object item);
+
+        /// <summary>
+        /// Ensures that the tree node is visible, expanding tree nodes and scrolling the tree view control as necessary
+        /// </summary>
+        void ScrollTo();
+
+        /// <summary>
+        /// Gets the parent of the node on the supplied (nesting) level 
+        /// </summary>
+        /// <param name="level">Nesting level</param>
+        ITreeNode GetParentOfLevel(int level);
+
+        void ShowContextMenu(Point location);
+
+        void EnsureVisible();
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeNodePresenter.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeNodePresenter.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeNodePresenter.cs	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -0,0 +1,172 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using Core.Common.Utils.Collections;
+
+namespace Core.Common.Controls
+{
+    /// <summary>
+    /// Defines logic for building treeViewNodes based on a certain node datatype.
+    /// </summary>
+    public interface ITreeNodePresenter
+    {
+        /// <summary>
+        /// TreeView containing the nodes.
+        /// </summary>
+        ITreeView TreeView { get; set; }
+
+        /// <summary>
+        /// Gets supported type of the object for this builder.
+        /// </summary>
+        Type NodeTagType { get; }
+
+        /// <summary>
+        /// Apply properties to newly created newNode.
+        /// </summary>
+        /// <param name="parentNode"></param>
+        /// <param name="node"></param>
+        /// <param name="nodeData"></param>
+        /// <returns></returns>
+        void UpdateNode(ITreeNode parentNode, ITreeNode node, object nodeData);
+
+        /// <summary>
+        /// Returns array of child objects for <paramref name="parentNodeData"/> for which nodes should be added.
+        /// </summary>
+        /// <param name="parentNodeData">The data belonging to the parent node.</param>
+        /// <returns>
+        ///   The collection of child objects.
+        ///   Post condition: Shall not return null.
+        /// </returns>
+        IEnumerable GetChildNodeObjects(object parentNodeData);
+
+        /// <summary>
+        /// Indicates whether the node text property is editable.
+        /// </summary>
+        /// <param name="node">The node to be renamed.</param>
+        /// <returns>True if <paramref name="node"/> can be renamed, false otherwise.</returns>
+        /// <remarks>Any <see cref="ITreeNodePresenter"/> that can return true with this method, should use <see cref="OnNodeRenamed"/> for renaming logic.</remarks>
+        /// <seealso cref="OnNodeRenamed"/>
+        bool CanRenameNode(ITreeNode node);
+
+        /// <summary>
+        /// Indicates that the can be renamed and newName is a valid name.
+        /// </summary>
+        /// <param name="node">The node to be renamed.</param>
+        /// <param name="newName">Suggested new name for <paramref name="node"/>.</param>
+        /// <returns>True if <paramref name="node"/> can be renamed, false otherwise.</returns>
+        /// <remarks>Any <see cref="ITreeNodePresenter"/> that can return true with this method, should use <see cref="OnNodeRenamed"/> for renaming logic.</remarks>
+        /// <seealso cref="OnNodeRenamed"/>
+        bool CanRenameNodeTo(ITreeNode node, string newName);
+
+        /// <summary>
+        /// Renames the node
+        /// </summary>
+        /// <param name="nodeData">Entity to be renamed.</param>
+        /// <param name="newName">New name for <paramref name="nodeData"/>.</param>
+        /// <seealso cref="CanRenameNode"/>
+        /// <seealso cref="CanRenameNodeTo"/>
+        void OnNodeRenamed(object nodeData, string newName);
+
+        /// <summary>
+        /// When the node has a checkbox, this method handles the data operation for checking/unchecking the node.
+        /// </summary>
+        /// <param name="node"></param>
+        void OnNodeChecked(ITreeNode node);
+
+        /// <summary>
+        /// Indicates if a node can be dragged to another location.
+        /// </summary>
+        /// <param name="nodeData"></param>
+        /// <returns>
+        /// The return value indicates which operations are valid. 
+        /// DragOperations can be xored
+        /// examples:
+        /// folder can be moved and copied
+        /// output vars of models can be linked
+        /// </returns>
+        DragOperations CanDrag(object nodeData);
+
+        /// <summary>
+        /// Indicates if a node can be dropped to another location.
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="sourceNode"></param>
+        /// <param name="targetNode"></param>
+        /// <param name="validOperations"></param>
+        /// <returns>
+        /// The return value indicates what operation is valid when the sourceNode is dropped onto the targetNode.
+        /// This can only one of the following values
+        /// None, Copy, Link, Move
+        /// ControlKeys pressed by the user should also be considered.
+        /// examples:
+        /// CanDrag: Folder can be moved or copied
+        ///          shift key is move
+        ///          ctrl key is copy
+        ///          alt key is liknk but not supported -> default
+        ///          default is move for folder in same project
+        ///                  is copy for folder to other project
+        /// </returns>
+        /// TODO: change item, sourceParentNodeData, targetParentNodeData to ITreeNode!
+        DragOperations CanDrop(object item, ITreeNode sourceNode, ITreeNode targetNode, DragOperations validOperations);
+
+        /// <summary>
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="sourceNode"></param>
+        /// <param name="targetNode"></param>
+        /// <returns></returns>
+        bool CanInsert(object item, ITreeNode sourceNode, ITreeNode targetNode);
+
+        /// <summary>
+        /// when a node is dropped onto a target node, this method handles the necessary data operations.
+        /// </summary>
+        /// <param name="item">Item being dropped</param>
+        /// <param name="sourceParentNodeData"></param>
+        /// <param name="targetParentNodeData">Target node data where <paramref name="item"/> is being dropped.</param>
+        /// <param name="operation"></param>
+        /// <param name="position"></param>
+        /// TODO: change item, sourceParentNodeData, targetParentNodeData to ITreeNode!
+        void OnDragDrop(object item, object sourceParentNodeData, object targetParentNodeData, DragOperations operation, int position);
+
+        /// <summary>
+        /// In case a node is selected by the user it might be necessary to notify observers.
+        /// </summary>
+        /// <param name="nodeData"></param>
+        void OnNodeSelected(object nodeData);
+
+        /// <summary>
+        /// Returns context menu based on current data
+        /// </summary>
+        ContextMenuStrip GetContextMenu(ITreeNode sender, object nodeData);
+
+        /// <summary>
+        /// Updates node due to it's property change.
+        /// </summary>
+        void OnPropertyChanged(object sender, ITreeNode node, PropertyChangedEventArgs e);
+
+        /// <summary>
+        /// Reflect changes in the collection of items contained by the e.Item to the tree
+        /// </summary>
+        /// <param name="sender">Sender of the event</param>
+        /// <param name="e">Event arguments, e.Item contains object which was added / removed</param>
+        void OnCollectionChanged(object sender, NotifyCollectionChangingEventArgs e);
+
+        // TODO: check it we need to replace these methods with OnKeyPressed()
+        /// <summary>
+        /// Indicates wether a nodeData can be removed from parentNodeData.
+        /// </summary>
+        /// <param name="parentNodeData"></param>
+        /// <param name="nodeData"></param>
+        /// <returns></returns>
+        bool CanRemove(object parentNodeData, object nodeData);
+
+        /// <summary>
+        /// Allow for deletion of node data from within the treeview.
+        /// </summary>
+        /// <param name="parentNodeData"></param>
+        /// <param name="nodeData"></param>
+        /// <returns>true if remove operation is processed</returns>
+        bool RemoveNodeData(object parentNodeData, object nodeData);
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeView.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeView.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeView.cs	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -0,0 +1,136 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Core.Common.Controls
+{
+    /// <summary>
+    /// Interface for visual TreeView to display hierarchical data.
+    /// </summary>
+    public interface ITreeView : IView
+    {
+        /// <summary>
+        /// Event to notify observers of changes in the selection
+        /// </summary>
+        event EventHandler SelectedNodeChanged;
+
+        event Action BeforeWaitUntilAllEventsAreProcessed;
+
+        /// <summary>
+        /// All nodes contained in the tree
+        /// </summary>
+        IList<ITreeNode> Nodes { get; }
+
+        /// <summary>
+        /// Currently selected node.
+        /// </summary>
+        ITreeNode SelectedNode { get; set; }
+
+        /// <summary>
+        /// Show / hide check boxes.
+        /// </summary>
+        bool CheckBoxes { get; set; }
+
+        /// <summary>
+        /// Node presenters, sitting between specific data objects and the tree view
+        /// </summary>
+        ICollection<ITreeNodePresenter> NodePresenters { get; }
+
+        IComparer TreeViewNodeSorter { get; set; }
+
+        IEnumerable<ITreeNode> AllLoadedNodes { get; }
+
+        /// <summary>
+        /// Returns a specific node presenter for the given data object.
+        /// </summary>
+        /// <param name="nodeData"></param>
+        /// <param name="node"></param>
+        ITreeNodePresenter GetTreeViewNodePresenter(object nodeData, ITreeNode node);
+
+        /// <summary>
+        /// Creates a new node (not added to the tree yet)
+        /// </summary>
+        /// <returns></returns>
+        ITreeNode NewNode();
+
+        /// <summary>
+        /// Creates a new node and adds it to the tree
+        /// </summary>
+        /// <returns></returns>
+        ITreeNode AddNewNode(ITreeNode parentNode, object nodeData, int insertionIndex = -1);
+
+        /// <summary>
+        /// Returns the node which tag is set to the given data object
+        /// </summary>
+        /// <param name="nodeData"></param>
+        /// <param name="skipUnLoadedNodes"></param>
+        /// <returns></returns>
+        ITreeNode GetNodeByTag(object nodeData, bool skipUnLoadedNodes = true);
+
+        /// <summary>
+        /// Refreshes the tree view based on the underlying data.
+        /// </summary>
+        void Refresh();
+
+        /// <summary>
+        /// TODO: move to node
+        /// </summary>
+        /// <param name="treeNode"></param>
+        [Obsolete("YAGNI")]
+        void RefreshChildNodes(ITreeNode treeNode);
+
+        void UpdateNode(ITreeNode treeNode);
+
+        /// <summary>
+        /// Tree view may perform some updates asynchroneously. 
+        /// This method allows to wait until all pending asynchroneous events are processed.
+        /// </summary>
+        void WaitUntilAllEventsAreProcessed();
+
+        /// <summary>
+        /// Collapses all nodes and their child nodes (recursively).
+        /// </summary>
+        void CollapseAll();
+
+        /// <summary>
+        /// Collapses a given node and all its child nodes (recursively).
+        /// </summary>
+        /// <param name="node"></param>
+        void CollapseAll(ITreeNode node);
+
+        /// <summary>
+        /// Expands all nodes and their child nodes (recursively).
+        /// </summary>
+        void ExpandAll();
+
+        /// <summary>
+        /// Expands a given node and all its child nodes (recursively).
+        /// </summary>
+        /// <param name="node"></param>
+        void ExpandAll(ITreeNode node);
+
+        /// <summary>
+        /// Gets node and all its child nodes (if loaded).
+        /// </summary>
+        /// <param name="node"></param>
+        /// <returns></returns>
+        IEnumerable<ITreeNode> GetAllLoadedNodes(ITreeNode node);
+
+        /// <summary>
+        /// Suspend tree view refreshes (long running actions), sets IsUpdateSuspended to true.
+        /// </summary>
+        void BeginUpdate();
+
+        /// <summary>
+        /// Ends updates, sets IsUpdateSuspended to false.
+        /// </summary>
+        void EndUpdate();
+
+        /// <summary>
+        /// Checks if label of current node can be edited and starts edit mode if this is the case.
+        /// </summary>
+        void StartLabelEdit();
+
+        void TryDeleteSelectedNodeData();
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -r5d3ef5d4a5042e908c036a1565793c1141b60a09 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 5d3ef5d4a5042e908c036a1565793c1141b60a09)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -81,9 +81,6 @@
     <Compile Include="DragOperations.cs" />
     <Compile Include="ICommand.cs" />
     <Compile Include="IReusableView.cs" />
-    <Compile Include="ITreeNode.cs" />
-    <Compile Include="ITreeNodePresenter.cs" />
-    <Compile Include="ITreeView.cs" />
     <Compile Include="ITypeEditor.cs" />
     <Compile Include="IView.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Fisheye: Tag e392d6abff8f363ed6fbcef2b7ddd1dd54c77348 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/ITreeNode.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e392d6abff8f363ed6fbcef2b7ddd1dd54c77348 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/ITreeNodePresenter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e392d6abff8f363ed6fbcef2b7ddd1dd54c77348 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/ITreeView.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs
===================================================================
diff -u -r85af6861f16df8c5d57e3e39d0d2874e7bd16b8e -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision 85af6861f16df8c5d57e3e39d0d2874e7bd16b8e)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Gui.ContextMenu;
Index: Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj
===================================================================
diff -u -rdd34060f96f6ad881bc93bee9c8f7505f322bcdc -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision dd34060f96f6ad881bc93bee9c8f7505f322bcdc)
+++ Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -69,6 +69,10 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Core/Common/test/Core.Common.Gui.TestUtils/ContextMenu/SimpleContextMenuBuilderProvder.cs
===================================================================
diff -u -r2e162fe8f639b0c637a5cbfe1c2f1a9236741072 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Core/Common/test/Core.Common.Gui.TestUtils/ContextMenu/SimpleContextMenuBuilderProvder.cs	(.../SimpleContextMenuBuilderProvder.cs)	(revision 2e162fe8f639b0c637a5cbfe1c2f1a9236741072)
+++ Core/Common/test/Core.Common.Gui.TestUtils/ContextMenu/SimpleContextMenuBuilderProvder.cs	(.../SimpleContextMenuBuilderProvder.cs)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -1,5 +1,4 @@
 using System;
-
 using Core.Common.Controls;
 using Core.Common.Gui.ContextMenu;
 
Index: Core/Common/test/Core.Common.Gui.TestUtils/Core.Common.Gui.TestUtils.csproj
===================================================================
diff -u -r2e162fe8f639b0c637a5cbfe1c2f1a9236741072 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Core/Common/test/Core.Common.Gui.TestUtils/Core.Common.Gui.TestUtils.csproj	(.../Core.Common.Gui.TestUtils.csproj)	(revision 2e162fe8f639b0c637a5cbfe1c2f1a9236741072)
+++ Core/Common/test/Core.Common.Gui.TestUtils/Core.Common.Gui.TestUtils.csproj	(.../Core.Common.Gui.TestUtils.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -84,6 +84,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r85af6861f16df8c5d57e3e39d0d2874e7bd16b8e -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 85af6861f16df8c5d57e3e39d0d2874e7bd16b8e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -63,6 +63,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs
===================================================================
diff -u -r6aa508233ca39077a4a10ec8275619d61ddab47b -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs	(.../CategoryTreeFolderNodePresenterTest.cs)	(revision 6aa508233ca39077a4a10ec8275619d61ddab47b)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs	(.../CategoryTreeFolderNodePresenterTest.cs)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -1,12 +1,10 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
 
 using Core.Common.Controls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.TestUtils;
 using Core.Common.TestUtils;
 
 using NUnit.Framework;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r85af6861f16df8c5d57e3e39d0d2874e7bd16b8e -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 85af6861f16df8c5d57e3e39d0d2874e7bd16b8e)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -61,6 +61,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r95837098c8fbc25212797c64431f6f16496814b3 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 95837098c8fbc25212797c64431f6f16496814b3)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -60,6 +60,10 @@
       <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj
===================================================================
diff -u -r95837098c8fbc25212797c64431f6f16496814b3 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision 95837098c8fbc25212797c64431f6f16496814b3)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -64,6 +64,10 @@
       <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r7a8e3d1718cb12c53c2b0573b056037ed02e9913 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 7a8e3d1718cb12c53c2b0573b056037ed02e9913)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -65,6 +65,10 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -r7a8e3d1718cb12c53c2b0573b056037ed02e9913 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 7a8e3d1718cb12c53c2b0573b056037ed02e9913)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -71,6 +71,10 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj
===================================================================
diff -u -r6bcbd610ececdc293a8883b50448f369e1fa4a25 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision 6bcbd610ececdc293a8883b50448f369e1fa4a25)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -97,6 +97,10 @@
       <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Ringtoets.Piping.Plugin.csproj
===================================================================
diff -u -r95837098c8fbc25212797c64431f6f16496814b3 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Ringtoets.Piping.Plugin.csproj	(.../Ringtoets.Piping.Plugin.csproj)	(revision 95837098c8fbc25212797c64431f6f16496814b3)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Ringtoets.Piping.Plugin.csproj	(.../Ringtoets.Piping.Plugin.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -83,6 +83,10 @@
       <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -r6bcbd610ececdc293a8883b50448f369e1fa4a25 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 6bcbd610ececdc293a8883b50448f369e1fa4a25)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -94,6 +94,10 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj
===================================================================
diff -u -r7a8e3d1718cb12c53c2b0573b056037ed02e9913 -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj	(.../Ringtoets.Piping.Plugin.Test.csproj)	(revision 7a8e3d1718cb12c53c2b0573b056037ed02e9913)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj	(.../Ringtoets.Piping.Plugin.Test.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
@@ -72,6 +72,10 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>