Moves the functionality of swing-common.jar into util.jar and removes swing-common.jar.

183 files changed, 421 insertions, 478 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
index 22f9bc6..8f3966d 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
@@ -16,8 +16,8 @@ import javax.swing.event.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>MessageDialog</tt> is a <tt>JDialog</tt> that contains a question
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/ExtListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/customcontrols/ExtListCellRenderer.java
index 89867b4..9267203 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/ExtListCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/ExtListCellRenderer.java
@@ -11,7 +11,7 @@ import java.awt.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * @author Yana Stamcheva
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
index 028f48d..caa7fa5 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
@@ -14,7 +14,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>MessageDialog</tt> is a <tt>JDialog</tt> that contains a question
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
index 35bcf20..4042011 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
@@ -13,7 +13,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 public class SCScrollPane
     extends JScrollPane
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommButton.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommButton.java
index dea87a1..87e21f7 100755
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommButton.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommButton.java
@@ -14,7 +14,7 @@ import javax.swing.*;
 import org.jvnet.lafwidget.animation.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>SIPCommButton</tt> is a very flexible <tt>JButton</tt> that allows
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToggleButton.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToggleButton.java
index c2e0f0d..6cbd4e5 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToggleButton.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToggleButton.java
@@ -11,7 +11,7 @@ import java.awt.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>SIPCommToggleButton</tt> is a flexible <tt>JToggleButton</tt> that
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/TitlePanel.java b/src/net/java/sip/communicator/impl/gui/customcontrols/TitlePanel.java
index 34fa4ef..758ee71 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/TitlePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/TitlePanel.java
@@ -10,7 +10,7 @@ import java.awt.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>TitlePanel</tt> is a decorated panel, that could be used for a header
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/TransparentBackground.java b/src/net/java/sip/communicator/impl/gui/customcontrols/TransparentBackground.java
index 116c395..4d427f3 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/TransparentBackground.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/TransparentBackground.java
@@ -12,7 +12,7 @@ import java.awt.image.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>TransparentBackground</tt> is a <tt>JComponent</tt>, which is
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
index 378a3cd..10ae623 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
@@ -16,7 +16,7 @@ import javax.swing.border.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * This class implements a basic wizard dialog, where the programmer can insert
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
index 898e778..382e673 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
@@ -14,7 +14,7 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * SIPCommButtonUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
index 1d1778d..22befe0 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
@@ -14,7 +14,7 @@ import javax.swing.plaf.basic.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The SIPCommChatSelectorMenuUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxMenuItemUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxMenuItemUI.java
index b763f5c..403d0e6 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxMenuItemUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxMenuItemUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The SIPCommCheckBoxMenuItemUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxUI.java
index 0bbc3a4..909d36b 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * SIPCommCheckBoxUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxEditor.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxEditor.java
index c31cf74..7b669e7 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxEditor.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxEditor.java
@@ -12,7 +12,7 @@ import java.awt.geom.*;
 import javax.swing.border.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The default editor for SIPCommunicator editable combo boxes.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxUI.java
index 7a817fb..e6a5336 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxUI.java
@@ -11,7 +11,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * SIPCommComboBoxUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommEditorPaneUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommEditorPaneUI.java
index cf55d0b..5d7992d 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommEditorPaneUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommEditorPaneUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The SIPCommEditorPaneUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLFUtils.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLFUtils.java
index e9aef89..8dcb715 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLFUtils.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLFUtils.java
@@ -9,7 +9,7 @@ package net.java.sip.communicator.impl.gui.lookandfeel;
 import java.awt.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * 
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLabelUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLabelUI.java
index d785c86..9f12927 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLabelUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLabelUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The SIPCommLabelUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommListUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommListUI.java
index dff8f08..f9734d2 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommListUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommListUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * <tt>SIPCommListUI</tt> is an implementation of the <tt>BasicListUI</tt>.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuItemUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuItemUI.java
index 9e164e7..38d43f3 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuItemUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuItemUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The SIPCommMenuItemUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuUI.java
index 086c6a7..9d92062 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuUI.java
@@ -11,7 +11,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The SIPCommMenuUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommOptionPaneUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommOptionPaneUI.java
index f252bbf..4882256 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommOptionPaneUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommOptionPaneUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The SIPCommOptionPaneUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPasswordFieldUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPasswordFieldUI.java
index 80bf980..848bba8 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPasswordFieldUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPasswordFieldUI.java
@@ -13,7 +13,7 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 import javax.swing.text.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The SIPCommPasswordFieldUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPopupMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPopupMenuUI.java
index 8369d95..6281207 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPopupMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPopupMenuUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  *  SIPCommPopupMenuUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
index 31cf18f..b542546 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
@@ -13,7 +13,7 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The SIPCommSelectorMenuUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommStatusMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommStatusMenuUI.java
index 172b21e..8f9a7b3 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommStatusMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommStatusMenuUI.java
@@ -11,7 +11,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The SIPCommMenuUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java
index d886477..1b637bc 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java
@@ -11,7 +11,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * SIPCommTextAreaUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
index 9904e8f..8c6721c 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
@@ -15,7 +15,7 @@ import javax.swing.text.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * SIPCommTextFieldUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextPaneUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextPaneUI.java
index f7cfac8..e2cad56 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextPaneUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextPaneUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * SIPCommTextPaneUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
index bd33f59..cec5d03 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
@@ -13,7 +13,7 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * SIPCommToggleButtonUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java
index 7234361..2c3ac7b 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * SIPCommToolBarUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolTipUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolTipUI.java
index 387b1e0..1746041 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolTipUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolTipUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * SIPCommToolTipUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
index 48f15d1..13911e4 100755
--- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
@@ -35,8 +35,8 @@ import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.resources.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
index a03d410..2be2ecc 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
@@ -15,7 +15,7 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>AccountRegSummaryPage</tt> is the last page of the account
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
index a6a0035..9316f25 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
@@ -21,8 +21,8 @@ import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java b/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
index f2b0128..10f4243 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
@@ -17,8 +17,8 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
index 7d0cb93..07720a3 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
@@ -16,7 +16,7 @@ import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * @author Yana Stamcheva
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
index 3c8b4a6..508a408 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
@@ -16,7 +16,7 @@ import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 public class AuthorizationResponseDialog extends SIPCommDialog
     implements ActionListener {
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
index 763cc28..1ed011d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
@@ -15,7 +15,7 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>RequestAuthorisationDialog</tt> is a <tt>JDialog</tt> that is
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java
index f0e3375..3839364 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java
@@ -16,8 +16,8 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The AccountSelectorBox is located in the main application window under the
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
index 91995b0..fc1e390 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
@@ -17,7 +17,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The dialog created for a given call.
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
index 7c8ac83..7d964d8 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
@@ -16,7 +16,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>CallPanel</tt> is the panel containing call information. It's created
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java
index 5b41132..b19648e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java
@@ -18,8 +18,8 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>CallParticipantPanel</tt> is the panel containing data for a call
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
index f272b59..84c6571 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
@@ -24,8 +24,8 @@ import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
index 04bb687..7dc8d04 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
@@ -18,8 +18,8 @@ import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The dialog created when an incoming call is received.
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java
index d2a8c6a..9493c2a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java
@@ -15,7 +15,7 @@ import javax.swing.event.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;

 import net.java.sip.communicator.impl.gui.i18n.*;

 import net.java.sip.communicator.impl.gui.lookandfeel.*;

-import net.java.sip.communicator.swing.*;

+import net.java.sip.communicator.util.swing.*;

 

 /**

  * Represents a <code>Dialog</code> which allows specifying the target contact

diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java
index 7566c05..bda14d3 100755
--- a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java
@@ -17,7 +17,7 @@ import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 public class ZrtpPanel extends TransparentPanel {
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
index 093fcb4..fbd1fdc 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
@@ -16,8 +16,8 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ChatContactRightButtonMenu</tt> is the menu, opened when user clicks
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index 51a164b..892bf41 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -29,8 +29,8 @@ import net.java.sip.communicator.service.gui.event.*;
 import net.java.sip.communicator.service.msghistory.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ChatPanel</tt> is the panel, where users can write and send messages,
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
index 43b12c9..48fddc3 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
@@ -13,8 +13,8 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ChatSendPanel</tt> is the panel in the bottom of the chat. It
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java
index 56114c4..303442c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java
@@ -17,8 +17,8 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ChatTransportSelectorBox</tt> represents the send via menu in the
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
index aecf871..88c017a 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
@@ -24,9 +24,9 @@ import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.keybindings.*;
-import net.java.sip.communicator.swing.*;
-import net.java.sip.communicator.swing.event.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
+import net.java.sip.communicator.util.swing.event.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
index 9dbece0..ef64326 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
@@ -23,8 +23,8 @@ import net.java.sip.communicator.impl.gui.main.chat.toolBars.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ChatWritePanel</tt> is the panel, where user writes her messages.
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
index 9815c64..6348c0d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
@@ -14,8 +14,8 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The dialog, shown when user click on the chat "Send" button, while the
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
index 9c85c54..54f208e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
@@ -21,7 +21,7 @@ import net.java.sip.communicator.impl.gui.main.contactlist.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The invite dialog is the one shown when the user clicks on the conference
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java
index e36d02a..edd5f06 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java
@@ -16,7 +16,7 @@ import javax.swing.text.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The configuration window for the chat room.
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
index 320ac33..37795a5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
@@ -15,7 +15,7 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The dialog that pops up when a chat room invitation is received.
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java
index 9f67906..6df7927 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java
@@ -12,8 +12,8 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>DatesListRenderer</tt> is a <tt>ListCellRenderer</tt>, specialized
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
index 3b2942e..3c125a6 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
@@ -26,8 +26,8 @@ import net.java.sip.communicator.service.msghistory.*;
 import net.java.sip.communicator.service.msghistory.event.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>HistoryWindow</tt> is the window, where user could view or search
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
index 63a82b0..df62720 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
@@ -14,7 +14,7 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>SearchPanel</tt> is the panel, where user could make a search in
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
index 2527e8e..17b9359 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
@@ -17,8 +17,8 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import say.swing.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
index 02cb753..8941e57 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
@@ -23,8 +23,8 @@ import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
index b37dd60..76f25ef 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
@@ -22,8 +22,8 @@ import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java
index d9e7945..5f4fd40 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java
@@ -15,7 +15,7 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The dialog containing a list of all chat rooms ever joined by the user and
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomsListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomsListCellRenderer.java
index c6d2ecd..b6d064b 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomsListCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomsListCellRenderer.java
@@ -13,7 +13,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ChatRoomsListCellRenderer</tt> is the custom cell renderer used in the
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
index 6e417c3..9fd0ac7 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
@@ -15,7 +15,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ChatRoomNamePanel</tt> is the form, where we should enter the chat
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
index e5a9412..957d48f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
@@ -14,7 +14,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>CreateChatRoomDialog</tt> is the dialog containing the form for adding
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
index cc0e579..d03b117 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
@@ -19,8 +19,8 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>SelectAccountPanel</tt> is where the user should select the account,
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
index 7d003b3..17e2b9a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
@@ -15,7 +15,7 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ChatRoomAuthenticationWindow</tt> is the the authentication window
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java
index d0dafb9..fd6e7e4 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java
@@ -14,7 +14,7 @@ import javax.swing.event.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ChatRoomNamePanel</tt> is the form, where we should enter the chat
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
index 063994a..721a054 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
@@ -15,8 +15,8 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>JoinChatRoomDialog</tt> is the dialog containing the form for joining
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java
index 25fcb73..1010fbb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java
@@ -18,8 +18,8 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 public class SearchChatRoomPanel
     extends TransparentPanel
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
index 89d3098..f612a73 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
@@ -17,8 +17,8 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>SelectAccountPanel</tt> is where the user should select the account,
diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java
index 307933b..9aff530 100644
--- a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java
@@ -16,8 +16,8 @@ import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.account.*;
 import net.java.sip.communicator.impl.gui.utils.Constants;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuGlassPane.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuGlassPane.java
index 749466b..c5c75bc 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuGlassPane.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuGlassPane.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
  
 public class ActionMenuGlassPane
     extends TransparentPanel
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuPanel.java
index 78e6c33..03a2715 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuPanel.java
@@ -17,8 +17,8 @@ import net.java.sip.communicator.impl.gui.main.chatroomslist.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.jvnet.lafwidget.animation.*;
 import org.osgi.framework.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactInfoDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactInfoDialog.java
index f9ee824..8395e27 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactInfoDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactInfoDialog.java
@@ -13,7 +13,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.service.contactlist.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ContactInfoPanel</tt> is a popup dialog containing the contact
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
index 1f4c051..ce60649 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
@@ -14,8 +14,8 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ContactListCellRenderer</tt> is the custom cell renderer used in the
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
index 62b0403..a50f32b 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
@@ -27,8 +27,8 @@ import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
index ea0533c..1dcb1a6 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
@@ -28,8 +28,8 @@ import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The GroupRightButtonMenu is the menu, opened when user clicks with the
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java
index 1d354ff..e30e473 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java
@@ -15,7 +15,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>MoveSubcontactMessageDialog</tt> is the the dialog shown when user
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java
index 626d353..0325b33 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java
@@ -14,7 +14,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.contactlist.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>RenameContactDialog</tt> is the dialog containing the form for
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java
index 256bc01..c63670d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>RenameContactPanel</tt> is where the user could change the name of a
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java
index 6adc803..35f8a39 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java
@@ -14,7 +14,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.contactlist.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>RenameGroupDialog</tt> is the dialog containing the form for
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java
index 99b72db..3efaf51 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java
@@ -11,7 +11,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>RenameGroupPanel</tt> is where the user could change the name of a
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java
index 32d28d4..3422e17 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java
@@ -16,8 +16,8 @@ import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>AddContactDialog</tt> is the dialog containing the form for adding
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java
index 3cf2813..c4d9e0e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java
@@ -14,7 +14,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>AddContactPanel</tt> is the form for adding a contact. It's used
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
index 7c426bf..9ca207a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
@@ -22,8 +22,8 @@ import net.java.sip.communicator.impl.gui.main.account.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.impl.gui.utils.Constants;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java
index 36040cc..d2cbc62 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java
@@ -16,7 +16,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>SelectGroupPanel</tt> is where the user should select the group,
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
index 71dc714..c617d41 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
@@ -14,8 +14,8 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.contactlist.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>CreateGroupDialog</tt> is the dialog containing the form for creating
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java
index d607e06..ebcc797 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java
@@ -13,7 +13,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>CreateGroupPanel</tt> is the form for creating a group.
diff --git a/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java b/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java
index 21bd146..f354f54 100644
--- a/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java
@@ -16,7 +16,7 @@ import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>LoginWindow</tt> is the window where the user should type his
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
index 18f4120..a2e2349 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
@@ -27,8 +27,8 @@ import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java b/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java
index 3e8382e..61268d7 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java
@@ -17,7 +17,7 @@ import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 public class AccountStatusPanel
     extends TransparentPanel
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
index eccce7d..7e1361a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
@@ -22,8 +22,8 @@ import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.systray.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>GlobalStatusSelectorBox</tt> is a global status selector box, which
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
index 20f291d..ded60ea 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
@@ -14,8 +14,8 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>NewStatusMessageDialog</tt> is the dialog containing the form for
diff --git a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
index 0187000..60dcc82 100644
--- a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
+++ b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
@@ -4,26 +4,30 @@ Bundle-Description: An implementation of the UI service.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
+ net.java.sip.communicator.service.audionotifier,
+ net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.callhistory,
+ net.java.sip.communicator.service.callhistory.event,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.icqconstants,
- net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.contacteventhandler,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
+ net.java.sip.communicator.service.keybindings,
  net.java.sip.communicator.service.msghistory,
  net.java.sip.communicator.service.msghistory.event,
- net.java.sip.communicator.service.callhistory,
- net.java.sip.communicator.service.callhistory.event,
- net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.notification,
- net.java.sip.communicator.service.systray,
- net.java.sip.communicator.service.contacteventhandler,
- net.java.sip.communicator.service.keybindings,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.icqconstants,
+ net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.systray,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
+ net.java.sip.communicator.util.swing.event,
+ net.java.sip.communicator.util.swing.plaf,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
@@ -38,10 +42,6 @@ Import-Package: org.osgi.framework,
  javax.swing.tree,
  javax.swing.undo,
  javax.swing.border,
- net.java.sip.communicator.service.audionotifier,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.swing.event,
- net.java.sip.communicator.swing.plaf,
  org.jdesktop.jdic.desktop,
  say.swing,
  com.apple.eawt
diff --git a/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java b/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java
index b1f3746..e6fbe0a 100644
--- a/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java
+++ b/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java
@@ -17,8 +17,8 @@ import javax.swing.table.*;
 

 import net.java.sip.communicator.service.media.*;

 import net.java.sip.communicator.service.resources.*;

-import net.java.sip.communicator.swing.*;

 import net.java.sip.communicator.util.*;

+import net.java.sip.communicator.util.swing.*;

 

 import org.osgi.framework.*;

 

diff --git a/src/net/java/sip/communicator/impl/media/media.manifest.mf b/src/net/java/sip/communicator/impl/media/media.manifest.mf
index 69ab1b3..aae28d2 100644
--- a/src/net/java/sip/communicator/impl/media/media.manifest.mf
+++ b/src/net/java/sip/communicator/impl/media/media.manifest.mf
@@ -24,8 +24,8 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.resources,
- net.java.sip.communicator.swing,
  net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  quicktime,
  quicktime.std.sg,
  quicktime.qd,
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHContactInfo.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHContactInfo.java
index e48bc5d..7fcd1b1 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHContactInfo.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/SSHContactInfo.java
@@ -19,7 +19,7 @@ import javax.swing.*;
 import javax.swing.text.*;
 
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf
index 2701876..d36636b 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf
@@ -16,5 +16,5 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.resources,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.util
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing
diff --git a/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java b/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java
index db3c35e..bc0ca71 100644
--- a/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java
+++ b/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java
@@ -12,8 +12,8 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>NewStatusMessageDialog</tt> is the dialog containing the form for
diff --git a/src/net/java/sip/communicator/impl/systray/systray.manifest.mf b/src/net/java/sip/communicator/impl/systray/systray.manifest.mf
index 893d5bd..aa4b520 100644
--- a/src/net/java/sip/communicator/impl/systray/systray.manifest.mf
+++ b/src/net/java/sip/communicator/impl/systray/systray.manifest.mf
@@ -9,16 +9,16 @@ Import-Package: org.osgi.framework,
  org.jdesktop.jdic.tray,

  com.apple.cocoa.application,

  com.apple.cocoa.foundation,

- net.java.sip.communicator.util,

- net.java.sip.communicator.swing,

  net.java.sip.communicator.service.configuration,

- net.java.sip.communicator.service.resources,

- net.java.sip.communicator.service.protocol,

- net.java.sip.communicator.service.protocol.event,

  net.java.sip.communicator.service.gui,

  net.java.sip.communicator.service.gui.event,

+ net.java.sip.communicator.service.protocol,

+ net.java.sip.communicator.service.protocol.event,

+ net.java.sip.communicator.service.resources,

  net.java.sip.communicator.service.systray,

  net.java.sip.communicator.service.systray.event,

+ net.java.sip.communicator.util,

+ net.java.sip.communicator.util.swing,

  javax.swing,

  javax.swing.event,

  javax.swing.table,

diff --git a/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java b/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java
index 7ea8eec..21e2bf4 100644
--- a/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java
+++ b/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java
@@ -18,8 +18,8 @@ import javax.swing.filechooser.FileFilter;
 

 import net.java.sip.communicator.service.protocol.*;

 import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;

-import net.java.sip.communicator.swing.*;

 import net.java.sip.communicator.util.*;

+import net.java.sip.communicator.util.swing.*;

 

 /**

  * The right side panel of AccountDetailsDialog. Shows one tab of a summary of

diff --git a/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java b/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java
index fb382e0..a0e5241 100644
--- a/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java
+++ b/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java
@@ -13,7 +13,7 @@ import javax.swing.*;
 import net.java.sip.communicator.service.gui.*;

 import net.java.sip.communicator.service.protocol.*;

 import net.java.sip.communicator.service.protocol.event.*;

-import net.java.sip.communicator.swing.*;

+import net.java.sip.communicator.util.swing.*;

 

 import org.osgi.framework.*;

 

diff --git a/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf b/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
index 4ec1392..f1ae175 100644
--- a/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
@@ -4,16 +4,16 @@ Bundle-Description: A plug-in that can set cross protocol account info.
 Bundle-Vendor: sip-communicator.org

 Bundle-Version: 0.0.1

 Import-Package: org.osgi.framework,

-  net.java.sip.communicator.util,

-  net.java.sip.communicator.swing,

-  net.java.sip.communicator.service.resources,

+  net.java.sip.communicator.service.browserlauncher,

   net.java.sip.communicator.service.contactlist,

   net.java.sip.communicator.service.contactlist.event,

   net.java.sip.communicator.service.gui,

   net.java.sip.communicator.service.gui.event,

   net.java.sip.communicator.service.protocol,

   net.java.sip.communicator.service.protocol.event,

-  net.java.sip.communicator.service.browserlauncher,

+  net.java.sip.communicator.service.resources,

+  net.java.sip.communicator.util,

+  net.java.sip.communicator.util.swing,

   javax.swing,

   javax.swing.event,

   javax.swing.table,

diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java
index aac686b..bb56dfb 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java
@@ -14,7 +14,7 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the uin
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
index 22fd0b9..41da269 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
@@ -4,20 +4,20 @@ Bundle-Description: AIM account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.icqconstants,
- net.java.sip.communicator.service.protocol.aimconstants,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.aimconstants,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.protocol.icqconstants,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java b/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java
index f27d303..43eddd8 100644
--- a/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java
@@ -15,7 +15,7 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ConfigurationForm</tt> that would be added in the user interface
diff --git a/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf b/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf
index f049a76..feed9c0 100644
--- a/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf
@@ -4,12 +4,12 @@ Bundle-Description: A bundle that would automatically put your protocols in the
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.2
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.service.resources,
- net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.gui,
- net.java.sip.communicator.swing,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.border,
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java
index a87b540..7a1c5ae 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.event.*;

 

 import net.java.sip.communicator.service.protocol.*;

-import net.java.sip.communicator.swing.*;

+import net.java.sip.communicator.util.swing.*;

 

 /**

  * The left side panel of ContactInfoDialog. Display all associated subcontacts

diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
index 48e680a..ae23f64 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
@@ -15,8 +15,8 @@ import javax.swing.event.*;
 

 import net.java.sip.communicator.service.protocol.*;

 import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;

-import net.java.sip.communicator.swing.*;

 import net.java.sip.communicator.util.*;

+import net.java.sip.communicator.util.swing.*;

 

 /**

  * The right side panel of ContactInfoDialog. Shows one tab of a summary of

diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java
index e34920c..b96f65a 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java
@@ -11,7 +11,7 @@ import java.util.*;
 

 import net.java.sip.communicator.service.contactlist.*;

 import net.java.sip.communicator.service.protocol.*;

-import net.java.sip.communicator.swing.*;

+import net.java.sip.communicator.util.swing.*;

 

 /**

  * A GUI plug-in for SIP Communicator that will allow cross protocol contact

diff --git a/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf b/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
index 70a896d..e3a4bfc 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
@@ -4,15 +4,15 @@ Bundle-Description: A plug-in that can show cross protocol user info.
 Bundle-Vendor: sip-communicator.org

 Bundle-Version: 0.0.1

 Import-Package: org.osgi.framework,

-  net.java.sip.communicator.util,

-  net.java.sip.communicator.swing,

-  net.java.sip.communicator.service.resources,

+  net.java.sip.communicator.service.browserlauncher,

   net.java.sip.communicator.service.contactlist,

   net.java.sip.communicator.service.contactlist.event,

   net.java.sip.communicator.service.gui,

   net.java.sip.communicator.service.gui.event,

   net.java.sip.communicator.service.protocol,

-  net.java.sip.communicator.service.browserlauncher,

+  net.java.sip.communicator.service.resources,

+  net.java.sip.communicator.util,

+  net.java.sip.communicator.util.swing,

   javax.swing,

   javax.swing.event,

   javax.swing.table,

diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java
index 5c0f059..83d1f1d 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java
@@ -16,7 +16,7 @@ import javax.swing.event.*;
 import net.java.dict4j.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the host,
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java
index 976da00..6a788cb 100755
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java
@@ -10,7 +10,7 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * Panel showing the current status of the search of the strategies
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
index 9ed3613..0166229 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
@@ -5,19 +5,19 @@ Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
  net.java.dict4j,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.icqconstants,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.protocol.icqconstants,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/exampleplugin/PluginDialog.java b/src/net/java/sip/communicator/plugin/exampleplugin/PluginDialog.java
index b162637..fd34ccd 100644
--- a/src/net/java/sip/communicator/plugin/exampleplugin/PluginDialog.java
+++ b/src/net/java/sip/communicator/plugin/exampleplugin/PluginDialog.java
@@ -11,7 +11,7 @@ import java.awt.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.service.contactlist.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * A plugin dialog that is open through the right button menu over a contact and
diff --git a/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf b/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
index 6d48c82..26d4992 100644
--- a/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
@@ -4,12 +4,12 @@ Bundle-Description: An example showing how to make plugins for the ui.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java
index 2a0e05d..3f9f60b 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java
+++ b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java
@@ -13,8 +13,8 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.service.callhistory.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import com.toedter.calendar.*;
 
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/extendedcallhistorysearch.manifest.mf b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/extendedcallhistorysearch.manifest.mf
index bcaf123..9335d32 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/extendedcallhistorysearch.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/extendedcallhistorysearch.manifest.mf
@@ -4,15 +4,15 @@ Bundle-Description: An Extended Call History Search
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources, 
+ net.java.sip.communicator.service.callhistory,
+ net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.callhistory,
- net.java.sip.communicator.service.configuration,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
index 98a444e..ed57a2e 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
@@ -14,8 +14,8 @@ import javax.swing.*;
 import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import com.izforge.izpack.util.os.*;
 
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf b/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
index 2ade50b..be3709a 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
@@ -4,14 +4,14 @@ Bundle-Description: The plugin offering general configuration page.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.configuration,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
index e2cacc0..945574b 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
@@ -14,7 +14,7 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the user ID
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
index 965dc29..4ebcd1f 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
@@ -4,18 +4,18 @@ Bundle-Description: Gibberish account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java
index 227e7cb..83d73be 100644
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java
@@ -15,8 +15,8 @@ import javax.swing.event.*;
 

 import net.java.sip.communicator.service.gui.*;

 import net.java.sip.communicator.service.protocol.*;

-import net.java.sip.communicator.swing.*;

 import net.java.sip.communicator.util.*;

+import net.java.sip.communicator.util.swing.*;

 

 /**

  * The <tt>FirstWizardPage</tt> is the page, where user could enter the user

diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
index da6c361..f85b003 100644
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
@@ -4,20 +4,20 @@ Bundle-Description: Google Talk account registration wizard.
 Bundle-Vendor: sip-communicator.org

 Bundle-Version: 0.0.1

 Import-Package: org.osgi.framework,

- net.java.sip.communicator.util,

- net.java.sip.communicator.swing,

+ net.java.sip.communicator.service.browserlauncher,

  net.java.sip.communicator.service.configuration,

- net.java.sip.communicator.service.resources,

  net.java.sip.communicator.service.configuration.event,

- net.java.sip.communicator.service.protocol,

- net.java.sip.communicator.service.protocol.icqconstants,

- net.java.sip.communicator.service.protocol.event,

  net.java.sip.communicator.service.contactlist,

  net.java.sip.communicator.service.contactlist.event,

+ net.java.sip.communicator.service.fileaccess,

  net.java.sip.communicator.service.gui,

  net.java.sip.communicator.service.gui.event,

- net.java.sip.communicator.service.fileaccess,

- net.java.sip.communicator.service.browserlauncher,

+ net.java.sip.communicator.service.protocol,

+ net.java.sip.communicator.service.protocol.event,

+ net.java.sip.communicator.service.protocol.icqconstants,

+ net.java.sip.communicator.service.resources,

+ net.java.sip.communicator.util,

+ net.java.sip.communicator.util.swing,

  javax.naming,

  javax.naming.directory,

  javax.xml.parsers,

diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
index d1eb2de..7f56c2f 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
@@ -14,7 +14,7 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the uin
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
index 9630f4f..7a1dec1 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
@@ -4,19 +4,19 @@ Bundle-Description: ICQ account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.resources,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.icqconstants,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.protocol.icqconstants,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java
index ad9011d..1054057 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java
@@ -17,7 +17,7 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the user ID
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
index 747443d..02e5d96 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
@@ -4,16 +4,16 @@ Bundle-Description: IRC account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
index 014a34b..c38e410 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
@@ -15,8 +15,8 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the user
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java
index 0f09402..0c5217e 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java
@@ -15,8 +15,8 @@ import javax.swing.*;
 import javax.swing.border.*;
 import javax.swing.event.*;
 
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.jivesoftware.smack.*;
 
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
index ccabf34..b6efedc 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
@@ -20,8 +20,8 @@ import javax.swing.table.*;
 import javax.xml.parsers.*;
 
 import net.java.sip.communicator.service.fileaccess.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 import org.w3c.dom.*;
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
index 1c9a612..4ff5349 100755
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
@@ -4,20 +4,20 @@ Bundle-Description: Jabber account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.icqconstants,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
+ net.java.sip.communicator.service.fileaccess,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.fileaccess,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.protocol.icqconstants,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.naming,
  javax.naming.directory,
  javax.xml.parsers,
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
index 2b23c1d..6ecd153 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
@@ -15,7 +15,7 @@ import javax.swing.*;
 import chooser.*;
 
 import net.java.sip.communicator.service.keybindings.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ConfigurationForm</tt> that would be added to the settings
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
index 8092f15..6787861 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
@@ -4,10 +4,10 @@ Bundle-Description: Provides configuring UI for keyboard shortcuts.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.keybindings,
  net.java.sip.communicator.service.resources,
- net.java.sip.communicator.swing,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
- javax.swing.event
\ No newline at end of file
+ javax.swing.event
diff --git a/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java b/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java
index 933f615..cac2b95 100644
--- a/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java
+++ b/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java
@@ -14,7 +14,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.configuration.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ConfigurationForm</tt> that would be added in the user interface
diff --git a/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf b/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf
index af093f7..89e15e4 100644
--- a/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf
@@ -4,18 +4,18 @@ Bundle-Description: A bundle that implements the Mailbox Package.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
+ net.java.sip.communicator.service.configuration,
+ net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.fileaccess,
+ net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.history,
  net.java.sip.communicator.service.history.event,
- net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.history.records,
- net.java.sip.communicator.service.gui,
+ net.java.sip.communicator.service.media,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.event,
- net.java.sip.communicator.service.media,
- net.java.sip.communicator.service.configuration,
- net.java.sip.communicator.swing,
  net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.filechooser,
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java
index badc603..7b33402 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java
@@ -13,7 +13,7 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the uin
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
index 020fef9..b70f82a 100755
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
@@ -4,19 +4,19 @@ Bundle-Description: Msn account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.icqconstants,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.protocol.icqconstants,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java
index f62fc13..2dc6194 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java
@@ -19,8 +19,8 @@ import javax.swing.event.*;
 import net.java.sip.communicator.service.audionotifier.*;
 import net.java.sip.communicator.service.notification.*;
 import net.java.sip.communicator.service.notification.event.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The UI of <tt>ConfigurationForm</tt> that would be added in the user
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
index 660681d..6c766c6 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
@@ -5,15 +5,15 @@ Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
+ net.java.sip.communicator.service.audionotifier,
+ net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.configuration,
- net.java.sip.communicator.service.audionotifier,
  net.java.sip.communicator.service.notification,
  net.java.sip.communicator.service.notification.event,
  net.java.sip.communicator.service.resources,
- net.java.sip.communicator.swing,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java b/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java
index 4c12a28..30ecb87 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java
@@ -13,8 +13,8 @@ import javax.swing.*;
 import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java b/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java
index ec07d76..0b30e6d 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java
@@ -14,7 +14,7 @@ import java.net.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerPanel.java b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerPanel.java
index b3f86f7..ee69f83 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerPanel.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerPanel.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.table.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf b/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf
index f71d412..d34c0c7 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf
@@ -9,8 +9,8 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
  net.java.sip.communicator.service.resources,
- net.java.sip.communicator.swing,
  net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java
index bba600c..b5a6288 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java
@@ -15,7 +15,7 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the user ID
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
index 691c91f..fb4829f 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
@@ -4,18 +4,18 @@ Bundle-Description: Rss account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
index 4880da1..8e24b5f 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
@@ -14,7 +14,7 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the uin
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
index 25ad690..09b4a1a 100755
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
@@ -4,19 +4,19 @@ Bundle-Description: SIP account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.resources,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.icqconstants,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.protocol.icqconstants,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
index 09fb974..b934f32 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
@@ -22,7 +22,7 @@ import javax.swing.event.*;
 import net.java.sip.communicator.impl.protocol.ssh.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the user ID
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
index 0694f25..c50ebd5 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
@@ -4,18 +4,18 @@ Bundle-Description: SSH account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java b/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
index 9fe2061..cb9b86e 100644
--- a/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
+++ b/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
@@ -19,8 +19,8 @@ import javax.swing.*;
 import net.java.sip.communicator.service.browserlauncher.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.service.version.VersionService;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf b/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf
index bf08da5..eb16831 100644
--- a/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf
@@ -4,12 +4,12 @@ Bundle-Description: A bundle that implements the UpdateCheck Plugin Package.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.gui,
+ net.java.sip.communicator.service.resources,
  net.java.sip.communicator.service.version,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.text,
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java
index b38758a..22f414d 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java
@@ -13,7 +13,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.plugin.whiteboard.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The dialog that pops up when a chat room invitation is received.
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
index 467bda5..88fe32e 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
@@ -22,8 +22,8 @@ import net.java.sip.communicator.plugin.whiteboard.gui.whiteboardshapes.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The frame for the Whiteboard
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf b/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
index 9827a73..d0802e5 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
@@ -4,16 +4,16 @@ Bundle-Description: A whiteboard for SIP-Communicator.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.protocol.whiteboardobjects,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java
index 9ee87f8..6361527 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java
@@ -13,7 +13,7 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the uin
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
index ebd3daa..a9418de 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
@@ -4,19 +4,19 @@ Bundle-Description: Yahoo account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.icqconstants,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.protocol.icqconstants,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java
index e71ef92..0a86fc4 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java
@@ -14,7 +14,7 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>FirstWizardPage</tt> is the page, where user could enter the user ID
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
index b1250c6..6710544 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
@@ -4,18 +4,18 @@ Bundle-Description: Zeroconf account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.swing,
- net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- net.java.sip.communicator.service.protocol,
- net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/swing/SwingCommonActivator.java b/src/net/java/sip/communicator/swing/SwingCommonActivator.java
deleted file mode 100644
index c0a0db1..0000000
--- a/src/net/java/sip/communicator/swing/SwingCommonActivator.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.swing;
-
-import java.awt.image.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import javax.imageio.*;
-
-import net.java.sip.communicator.service.configuration.*;
-import net.java.sip.communicator.service.keybindings.*;
-import net.java.sip.communicator.service.resources.*;
-import net.java.sip.communicator.util.*;
-
-import org.osgi.framework.*;
-
-/**
- * @author Lubomir Marinov
- */
-public class SwingCommonActivator
-    implements BundleActivator
-{
-    private static BundleContext bundleContext;
-
-    private static ConfigurationService configurationService;
-
-    private static final Map<String, BufferedImage> imageCache =
-        new HashMap<String, BufferedImage>();
-
-    private static KeybindingsService keybindingsService;
-
-    private static final Logger logger =
-        Logger.getLogger(SwingCommonActivator.class);
-
-    private static ResourceManagementService resources;
-
-    public static ConfigurationService getConfigurationService()
-    {
-        if (configurationService == null)
-        {
-            ServiceReference serviceReference =
-                bundleContext.getServiceReference(ConfigurationService.class
-                    .getName());
-
-            if (serviceReference != null)
-                configurationService =
-                    (ConfigurationService) bundleContext
-                        .getService(serviceReference);
-        }
-        return configurationService;
-    }
-
-    public static KeybindingsService getKeybindingsService()
-    {
-        if (keybindingsService == null)
-        {
-            ServiceReference serviceReference =
-                bundleContext.getServiceReference(KeybindingsService.class
-                    .getName());
-
-            if (serviceReference != null)
-                keybindingsService =
-                    (KeybindingsService) bundleContext
-                        .getService(serviceReference);
-        }
-        return keybindingsService;
-    }
-
-    public static BufferedImage getImage(String key)
-    {
-        if (imageCache.containsKey(key))
-            return imageCache.get(key);
-
-        URL url = getResources().getImageURL(key);
-        BufferedImage image = null;
-        if (url != null)
-        {
-            try
-            {
-                image = ImageIO.read(url);
-
-                imageCache.put(key, image);
-            }
-            catch (IOException ex)
-            {
-                logger.error("Failed to load image " + key, ex);
-            }
-        }
-        return image;
-    }
-
-    public static ResourceManagementService getResources()
-    {
-        if (resources == null)
-            resources =
-                ResourceManagementServiceUtils.getService(bundleContext);
-        return resources;
-    }
-
-    public void start(BundleContext bundleContext)
-    {
-        SwingCommonActivator.bundleContext = bundleContext;
-    }
-
-    public void stop(BundleContext bundleContext)
-    {
-        if (SwingCommonActivator.bundleContext == bundleContext)
-            SwingCommonActivator.bundleContext = null;
-    }
-}
diff --git a/src/net/java/sip/communicator/swing/swing.common.manifest.mf b/src/net/java/sip/communicator/swing/swing.common.manifest.mf
deleted file mode 100644
index 106517a..0000000
--- a/src/net/java/sip/communicator/swing/swing.common.manifest.mf
+++ /dev/null
@@ -1,20 +0,0 @@
-Bundle-Activator: net.java.sip.communicator.swing.SwingCommonActivator

-Bundle-Name: Swing Common

-Bundle-Description: Common/generic Swing additions not specific to SIP Communicator

-Bundle-Vendor: sip-communicator.org

-Bundle-Version: 0.0.1

-Import-Package: javax.imageio,

- javax.swing,

- javax.swing.border,

- javax.swing.event,

- javax.swing.plaf,

- javax.swing.plaf.basic,

- javax.swing.text,

- net.java.sip.communicator.service.configuration,

- net.java.sip.communicator.service.keybindings,

- net.java.sip.communicator.service.resources,

- net.java.sip.communicator.util,

- org.osgi.framework

-Export-Package: net.java.sip.communicator.swing,

- net.java.sip.communicator.swing.event,

- net.java.sip.communicator.swing.plaf

diff --git a/src/net/java/sip/communicator/util/UtilActivator.java b/src/net/java/sip/communicator/util/UtilActivator.java
index b7f6a5d..e271294 100644
--- a/src/net/java/sip/communicator/util/UtilActivator.java
+++ b/src/net/java/sip/communicator/util/UtilActivator.java
@@ -6,6 +6,15 @@
  */
 package net.java.sip.communicator.util;
 
+import java.awt.image.*;
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+import javax.imageio.*;
+
+import net.java.sip.communicator.service.configuration.*;
+import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.service.resources.*;
 
 import org.osgi.framework.*;
@@ -25,10 +34,17 @@ public class UtilActivator
     private static final Logger logger
         = Logger.getLogger(UtilActivator.class);
 
+    private static ConfigurationService configurationService;
+
+    private static KeybindingsService keybindingsService;
+
     private static ResourceManagementService resourceService;
 
     private static BundleContext bundleContext;
 
+    private static final Map<String, BufferedImage> imageCache =
+        new HashMap<String, BufferedImage>();
+
     /**
      * Calls <tt>Thread.setUncaughtExceptionHandler()</tt>
      *
@@ -47,7 +63,6 @@ public class UtilActivator
         bundleContext = context;
 
         Thread.setDefaultUncaughtExceptionHandler(this);
-        Thread.currentThread().setDefaultUncaughtExceptionHandler(this);
     }
 
     /**
@@ -85,6 +100,38 @@ public class UtilActivator
 
     }
 
+    public static ConfigurationService getConfigurationService()
+    {
+        if (configurationService == null)
+        {
+            ServiceReference serviceReference =
+                bundleContext.getServiceReference(ConfigurationService.class
+                    .getName());
+
+            if (serviceReference != null)
+                configurationService =
+                    (ConfigurationService) bundleContext
+                        .getService(serviceReference);
+        }
+        return configurationService;
+    }
+
+    public static KeybindingsService getKeybindingsService()
+    {
+        if (keybindingsService == null)
+        {
+            ServiceReference serviceReference =
+                bundleContext.getServiceReference(KeybindingsService.class
+                    .getName());
+
+            if (serviceReference != null)
+                keybindingsService =
+                    (KeybindingsService) bundleContext
+                        .getService(serviceReference);
+        }
+        return keybindingsService;
+    }
+
     /**
      * Returns the service giving access to all application resources.
      * 
@@ -98,4 +145,27 @@ public class UtilActivator
 
         return resourceService;
     }
+
+    public static BufferedImage getImage(String key)
+    {
+        if (imageCache.containsKey(key))
+            return imageCache.get(key);
+
+        URL url = getResources().getImageURL(key);
+        BufferedImage image = null;
+        if (url != null)
+        {
+            try
+            {
+                image = ImageIO.read(url);
+
+                imageCache.put(key, image);
+            }
+            catch (IOException ex)
+            {
+                logger.error("Failed to load image " + key, ex);
+            }
+        }
+        return image;
+    }
 }
diff --git a/src/net/java/sip/communicator/swing/AntialiasingManager.java b/src/net/java/sip/communicator/util/swing/AntialiasingManager.java
index 1577159..12c0bd7 100644
--- a/src/net/java/sip/communicator/swing/AntialiasingManager.java
+++ b/src/net/java/sip/communicator/util/swing/AntialiasingManager.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing;
+package net.java.sip.communicator.util.swing;
 
 import java.awt.*;
 
diff --git a/src/net/java/sip/communicator/swing/FitLayout.java b/src/net/java/sip/communicator/util/swing/FitLayout.java
index bca9a07..f57d9b3 100644
--- a/src/net/java/sip/communicator/swing/FitLayout.java
+++ b/src/net/java/sip/communicator/util/swing/FitLayout.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.

  * See terms of license at gnu.org.

  */

-package net.java.sip.communicator.swing;

+package net.java.sip.communicator.util.swing;

 

 import java.awt.*;

 

diff --git a/src/net/java/sip/communicator/swing/ImageCanvas.java b/src/net/java/sip/communicator/util/swing/ImageCanvas.java
index 6c90c79..6fe4347 100644
--- a/src/net/java/sip/communicator/swing/ImageCanvas.java
+++ b/src/net/java/sip/communicator/util/swing/ImageCanvas.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing;
+package net.java.sip.communicator.util.swing;
 
 import java.awt.*;
 
diff --git a/src/net/java/sip/communicator/swing/SIPCommCheckBox.java b/src/net/java/sip/communicator/util/swing/SIPCommCheckBox.java
index d2b359c..cabac5c 100644
--- a/src/net/java/sip/communicator/swing/SIPCommCheckBox.java
+++ b/src/net/java/sip/communicator/util/swing/SIPCommCheckBox.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.

  * See terms of license at gnu.org.

  */

-package net.java.sip.communicator.swing;

+package net.java.sip.communicator.util.swing;

 

 import javax.swing.*;

 

diff --git a/src/net/java/sip/communicator/swing/SIPCommDialog.java b/src/net/java/sip/communicator/util/swing/SIPCommDialog.java
index 562d9fa..8993565 100644
--- a/src/net/java/sip/communicator/swing/SIPCommDialog.java
+++ b/src/net/java/sip/communicator/util/swing/SIPCommDialog.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing;
+package net.java.sip.communicator.util.swing;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -141,7 +141,7 @@ public abstract class SIPCommDialog extends JDialog
     private void saveSizeAndLocation()
     {
         ConfigurationService configService =
-            SwingCommonActivator.getConfigurationService();
+            UtilActivator.getConfigurationService();
 
         String className = this.getClass().getName();
                 
@@ -174,7 +174,7 @@ public abstract class SIPCommDialog extends JDialog
     private void setSizeAndLocation()
     {
         ConfigurationService configService =
-            SwingCommonActivator.getConfigurationService();
+            UtilActivator.getConfigurationService();
 
         String className = this.getClass().getName();
         
diff --git a/src/net/java/sip/communicator/swing/SIPCommFrame.java b/src/net/java/sip/communicator/util/swing/SIPCommFrame.java
index 60cd23d..fbcbafa 100644
--- a/src/net/java/sip/communicator/swing/SIPCommFrame.java
+++ b/src/net/java/sip/communicator/util/swing/SIPCommFrame.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing;
+package net.java.sip.communicator.util.swing;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -43,7 +43,7 @@ public abstract class SIPCommFrame
     {
         this.setContentPane(new MainContentPane());
 
-        Image scLogo = SwingCommonActivator.getImage(SIP_COMMUNICATOR_LOGO);
+        Image scLogo = UtilActivator.getImage(SIP_COMMUNICATOR_LOGO);
         this.setIconImage(scLogo);
 
         // In order to have the same icon when using option panes
@@ -90,7 +90,7 @@ public abstract class SIPCommFrame
 
         // Adds new bindings to input map
         this.bindings =
-            SwingCommonActivator.getKeybindingsService().getBindings(category);
+            UtilActivator.getKeybindingsService().getBindings(category);
 
         for (Map.Entry<KeyStroke, String> key2action : this.bindings
             .getBindings().entrySet())
@@ -136,7 +136,7 @@ public abstract class SIPCommFrame
     private void saveSizeAndLocation()
     {
         ConfigurationService configService =
-            SwingCommonActivator.getConfigurationService();
+            UtilActivator.getConfigurationService();
 
         String className = this.getClass().getName();
 
@@ -165,7 +165,7 @@ public abstract class SIPCommFrame
     public void setSizeAndLocation()
     {
         ConfigurationService configService =
-            SwingCommonActivator.getConfigurationService();
+            UtilActivator.getConfigurationService();
 
         String className = this.getClass().getName();
 
@@ -409,7 +409,7 @@ public abstract class SIPCommFrame
             super(new BorderLayout());
 
             ResourceManagementService resources =
-                SwingCommonActivator.getResources();
+                UtilActivator.getResources();
 
             isColorBgEnabled =
                 new Boolean(resources.getSettingsString(
diff --git a/src/net/java/sip/communicator/swing/SIPCommTabbedPane.java b/src/net/java/sip/communicator/util/swing/SIPCommTabbedPane.java
index 0ee7ebc..cac0463 100644
--- a/src/net/java/sip/communicator/swing/SIPCommTabbedPane.java
+++ b/src/net/java/sip/communicator/util/swing/SIPCommTabbedPane.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing;
+package net.java.sip.communicator.util.swing;
 
 /*
  * The following code borrowed from David Bismut, davidou@mageos.com Intern,
@@ -19,8 +19,8 @@ import javax.swing.*;
 import javax.swing.border.*;
 import javax.swing.event.*;
 
-import net.java.sip.communicator.swing.event.*;
-import net.java.sip.communicator.swing.plaf.*;
+import net.java.sip.communicator.util.swing.event.*;
+import net.java.sip.communicator.util.swing.plaf.*;
 
 /**
  * A JTabbedPane with some added UI functionalities. A close and max/detach
diff --git a/src/net/java/sip/communicator/swing/ScreenInformation.java b/src/net/java/sip/communicator/util/swing/ScreenInformation.java
index f8cd6ee..3453b3d 100644
--- a/src/net/java/sip/communicator/swing/ScreenInformation.java
+++ b/src/net/java/sip/communicator/util/swing/ScreenInformation.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.

  * See terms of license at gnu.org.

  */

-package net.java.sip.communicator.swing;

+package net.java.sip.communicator.util.swing;

 

 import java.awt.*;

 

diff --git a/src/net/java/sip/communicator/swing/TransparentPanel.java b/src/net/java/sip/communicator/util/swing/TransparentPanel.java
index a8574e4..ad95589 100644
--- a/src/net/java/sip/communicator/swing/TransparentPanel.java
+++ b/src/net/java/sip/communicator/util/swing/TransparentPanel.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing;
+package net.java.sip.communicator.util.swing;
 
 import java.awt.*;
 
diff --git a/src/net/java/sip/communicator/swing/VideoContainer.java b/src/net/java/sip/communicator/util/swing/VideoContainer.java
index a4dc2f2..761d3f7 100644
--- a/src/net/java/sip/communicator/swing/VideoContainer.java
+++ b/src/net/java/sip/communicator/util/swing/VideoContainer.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.

  * See terms of license at gnu.org.

  */

-package net.java.sip.communicator.swing;

+package net.java.sip.communicator.util.swing;

 

 import java.awt.*;

 import java.awt.event.*;

diff --git a/src/net/java/sip/communicator/swing/VideoLayout.java b/src/net/java/sip/communicator/util/swing/VideoLayout.java
index 8c624e8..dd16ec2 100644
--- a/src/net/java/sip/communicator/swing/VideoLayout.java
+++ b/src/net/java/sip/communicator/util/swing/VideoLayout.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.

  * See terms of license at gnu.org.

  */

-package net.java.sip.communicator.swing;

+package net.java.sip.communicator.util.swing;

 

 import java.awt.*;

 

diff --git a/src/net/java/sip/communicator/swing/event/CloseListener.java b/src/net/java/sip/communicator/util/swing/event/CloseListener.java
index 8a2d301..e0dcd8f 100644
--- a/src/net/java/sip/communicator/swing/event/CloseListener.java
+++ b/src/net/java/sip/communicator/util/swing/event/CloseListener.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing.event;
+package net.java.sip.communicator.util.swing.event;
 
 /*
  * The content of this file was based on code borrowed from David Bismut,
diff --git a/src/net/java/sip/communicator/swing/event/DoubleClickListener.java b/src/net/java/sip/communicator/util/swing/event/DoubleClickListener.java
index 7a8987e..195ca8c 100644
--- a/src/net/java/sip/communicator/swing/event/DoubleClickListener.java
+++ b/src/net/java/sip/communicator/util/swing/event/DoubleClickListener.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing.event;
+package net.java.sip.communicator.util.swing.event;
 
 /*
  * The following code borrowed from David Bismut, davidou@mageos.com Intern,
diff --git a/src/net/java/sip/communicator/swing/event/MaxListener.java b/src/net/java/sip/communicator/util/swing/event/MaxListener.java
index 2ab27aa..f25c107 100644
--- a/src/net/java/sip/communicator/swing/event/MaxListener.java
+++ b/src/net/java/sip/communicator/util/swing/event/MaxListener.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing.event;
+package net.java.sip.communicator.util.swing.event;
 
 /*
  * The following code borrowed from David Bismut, davidou@mageos.com Intern,
diff --git a/src/net/java/sip/communicator/swing/event/PopupOutsideListener.java b/src/net/java/sip/communicator/util/swing/event/PopupOutsideListener.java
index 14c6a11..2c73327 100644
--- a/src/net/java/sip/communicator/swing/event/PopupOutsideListener.java
+++ b/src/net/java/sip/communicator/util/swing/event/PopupOutsideListener.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing.event;
+package net.java.sip.communicator.util.swing.event;
 
 /*
  * The following code borrowed from David Bismut, davidou@mageos.com Intern,
diff --git a/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneEnhancedUI.java b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTabbedPaneEnhancedUI.java
index 51ec16b..5e406bc 100644
--- a/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneEnhancedUI.java
+++ b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTabbedPaneEnhancedUI.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing.plaf;
+package net.java.sip.communicator.util.swing.plaf;
 
 /*
  * The content of this file was based on code borrowed from David Bismut,
@@ -20,7 +20,8 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 import javax.swing.text.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * This UI displays a different interface, which is independent from the look
@@ -35,7 +36,7 @@ public class SIPCommTabbedPaneEnhancedUI
     private static final Color whiteColor = Color.white;
 
     private static final int TAB_OVERLAP
-        = new Integer(SwingCommonActivator.getResources().
+        = new Integer(UtilActivator.getResources().
             getSettingsString("impl.gui.TAB_OVERLAP")).intValue();
 
     private static final int PREFERRED_WIDTH = 150;
@@ -165,25 +166,24 @@ public class SIPCommTabbedPaneEnhancedUI
         {
             if (tabPane.isEnabledAt(tabIndex))
             {
-                leftImg = SwingCommonActivator.getImage(SELECTED_TAB_LEFT_BG);
-                middleImg =
-                    SwingCommonActivator.getImage(SELECTED_TAB_MIDDLE_BG);
-                rightImg = SwingCommonActivator.getImage(SELECTED_TAB_RIGHT_BG);
+                leftImg = UtilActivator.getImage(SELECTED_TAB_LEFT_BG);
+                middleImg = UtilActivator.getImage(SELECTED_TAB_MIDDLE_BG);
+                rightImg = UtilActivator.getImage(SELECTED_TAB_RIGHT_BG);
 
                 tabOverlap = TAB_OVERLAP;
             }
             else
             {
-                leftImg = SwingCommonActivator.getImage(TAB_LEFT_BG);
-                middleImg = SwingCommonActivator.getImage(TAB_MIDDLE_BG);
-                rightImg = SwingCommonActivator.getImage(TAB_RIGHT_BG);
+                leftImg = UtilActivator.getImage(TAB_LEFT_BG);
+                middleImg = UtilActivator.getImage(TAB_MIDDLE_BG);
+                rightImg = UtilActivator.getImage(TAB_RIGHT_BG);
             }
         }
         else
         {
-            leftImg = SwingCommonActivator.getImage(TAB_LEFT_BG);
-            middleImg = SwingCommonActivator.getImage(TAB_MIDDLE_BG);
-            rightImg = SwingCommonActivator.getImage(TAB_RIGHT_BG);
+            leftImg = UtilActivator.getImage(TAB_LEFT_BG);
+            middleImg = UtilActivator.getImage(TAB_MIDDLE_BG);
+            rightImg = UtilActivator.getImage(TAB_RIGHT_BG);
         }
         
         g2.drawImage(leftImg, x, y, null);
diff --git a/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneUI.java b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTabbedPaneUI.java
index 03ffd81..7e852fb 100644
--- a/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneUI.java
+++ b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTabbedPaneUI.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing.plaf;
+package net.java.sip.communicator.util.swing.plaf;
 
 /*
  * The content of this file was based on code borrowed from David Bismut,
@@ -23,7 +23,8 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 import javax.swing.text.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * SIPCommTabbedPaneUI implementation.
@@ -116,12 +117,12 @@ public class SIPCommTabbedPaneUI
     {
         super();
 
-        closeImgB = SwingCommonActivator.getImage(CLOSE_TAB_SELECTED_ICON);
+        closeImgB = UtilActivator.getImage(CLOSE_TAB_SELECTED_ICON);
 
         maxImgB = new BufferedImage(BUTTONSIZE, BUTTONSIZE,
                 BufferedImage.TYPE_4BYTE_ABGR);
 
-        closeImgI = SwingCommonActivator.getImage(CLOSE_TAB_ICON);
+        closeImgI = UtilActivator.getImage(CLOSE_TAB_ICON);
 
         maxImgI = new BufferedImage(BUTTONSIZE, BUTTONSIZE,
                 BufferedImage.TYPE_4BYTE_ABGR);
diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf
index 830540d..67709da 100644
--- a/src/net/java/sip/communicator/util/util.manifest.mf
+++ b/src/net/java/sip/communicator/util/util.manifest.mf
@@ -3,23 +3,31 @@ Bundle-Name: SIP Communicator Utility Packages
 Bundle-Description: A bundle that export packages with utility classes.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-Import-Package: org.osgi.framework,
+Import-Package: org.xml.sax, 
  org.w3c.dom,
- org.xml.sax,
- javax.xml.parsers,
+ org.osgi.framework,
  org.apache.xml.serialize,
- javax.xml.transform,
- javax.xml.transform.dom,
  javax.xml.transform.stream,
- javax.naming,
- javax.naming.directory,
- javax.swing,
+ javax.xml.transform.dom,
+ javax.xml.transform,
+ javax.xml.parsers,
  javax.swing.text.html,
  javax.swing.text,
+ javax.swing.plaf.basic,
+ javax.swing.plaf,
+ javax.swing.event,
+ javax.swing.border,
+ javax.swing,
+ javax.naming.directory,
+ javax.naming,
+ javax.imageio,
  net.java.sip.communicator.util.xml,
  net.java.sip.communicator.util,
  net.java.sip.communicator.service.resources,
- javax.imageio
+ net.java.sip.communicator.service.keybindings,
+ net.java.sip.communicator.service.configuration
 Export-Package: net.java.sip.communicator.util.xml,
- net.java.sip.communicator.util,
-
+ net.java.sip.communicator.util.swing.plaf,
+ net.java.sip.communicator.util.swing.event,
+ net.java.sip.communicator.util.swing,
+ net.java.sip.communicator.util