diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafButton.java b/trunk/SIPRPSoft/src/leaf/LeafButton.java
similarity index 98%
rename from trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafButton.java
rename to trunk/SIPRPSoft/src/leaf/LeafButton.java
index 40fa920f..0ca1aedc 100644
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafButton.java
+++ b/trunk/SIPRPSoft/src/leaf/LeafButton.java
@@ -1,4 +1,4 @@
-package siprp.medicina.processo.ui;
+package leaf;
 
 import java.awt.Color;
 import java.awt.GradientPaint;
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafCalendarDialog.java b/trunk/SIPRPSoft/src/leaf/LeafCalendarDialog.java
similarity index 99%
rename from trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafCalendarDialog.java
rename to trunk/SIPRPSoft/src/leaf/LeafCalendarDialog.java
index 9c508384..7e16720b 100644
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafCalendarDialog.java
+++ b/trunk/SIPRPSoft/src/leaf/LeafCalendarDialog.java
@@ -1,4 +1,4 @@
-package siprp.medicina.processo.ui;
+package leaf;
 
 import info.clearthought.layout.TableLayout;
 import info.clearthought.layout.TableLayoutConstraints;
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafGradientPanel.java b/trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java
similarity index 95%
rename from trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafGradientPanel.java
rename to trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java
index e48b38c6..a83131be 100644
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafGradientPanel.java
+++ b/trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java
@@ -1,4 +1,4 @@
-package siprp.medicina.processo.ui;
+package leaf;
 
 import java.awt.Color;
 
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java b/trunk/SIPRPSoft/src/leaf/LeafInputField.java
similarity index 99%
rename from trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java
rename to trunk/SIPRPSoft/src/leaf/LeafInputField.java
index 0a07f1f2..0b719a76 100644
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java
+++ b/trunk/SIPRPSoft/src/leaf/LeafInputField.java
@@ -1,4 +1,4 @@
-package siprp.medicina.processo.ui;
+package leaf;
 
 import info.clearthought.layout.TableLayout;
 import info.clearthought.layout.TableLayoutConstraints;
@@ -28,6 +28,8 @@ import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 
+import siprp.medicina.processo.ui.OrderedMap;
+
 public class LeafInputField<ObjClass extends Object> extends JPanel implements FocusListener, MouseListener
 {
 	public static final String PROPERTY_CHANGED_CONSTANT = "LEAF_INPUT_PROPERTY_CHANGED";
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java b/trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java
similarity index 99%
rename from trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java
rename to trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java
index 2760b740..b7581a6c 100644
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java
+++ b/trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java
@@ -1,4 +1,4 @@
-package siprp.medicina.processo.ui;
+package leaf;
 
 import info.clearthought.layout.TableLayout;
 import info.clearthought.layout.TableLayoutConstraints;
@@ -19,6 +19,8 @@ import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JSeparator;
 
+import siprp.medicina.processo.ui.OrderedMap;
+
 public class LeafOptionDialog<KeyClass extends Object> extends JDialog
 {
 	private static final Dimension OPTION_SIZE = new Dimension( 200, 20 );
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafTextDialog.java b/trunk/SIPRPSoft/src/leaf/LeafTextDialog.java
similarity index 99%
rename from trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafTextDialog.java
rename to trunk/SIPRPSoft/src/leaf/LeafTextDialog.java
index f42f64bb..b40f7384 100644
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafTextDialog.java
+++ b/trunk/SIPRPSoft/src/leaf/LeafTextDialog.java
@@ -1,4 +1,4 @@
-package siprp.medicina.processo.ui;
+package leaf;
 
 import info.clearthought.layout.TableLayout;
 import info.clearthought.layout.TableLayoutConstraints;
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafTransparentPanel.java b/trunk/SIPRPSoft/src/leaf/LeafTransparentPanel.java
similarity index 96%
rename from trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafTransparentPanel.java
rename to trunk/SIPRPSoft/src/leaf/LeafTransparentPanel.java
index af00516b..fc66d635 100644
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafTransparentPanel.java
+++ b/trunk/SIPRPSoft/src/leaf/LeafTransparentPanel.java
@@ -1,4 +1,4 @@
-package siprp.medicina.processo.ui;
+package leaf;
 
 import java.awt.AWTException;
 import java.awt.Dimension;
diff --git a/trunk/SIPRPSoft/src/leaf/LeafWindow.java b/trunk/SIPRPSoft/src/leaf/LeafWindow.java
index 724fa1ca..16a04aaf 100755
--- a/trunk/SIPRPSoft/src/leaf/LeafWindow.java
+++ b/trunk/SIPRPSoft/src/leaf/LeafWindow.java
@@ -35,7 +35,6 @@ import javax.swing.table.TableModel;
 import leaf.LeafLogic.Action;
 import leaf.LeafLogic.LeafLogicActionBinding;
 import leaf.LeafLogic.LeafUIActionBinding;
-import siprp.medicina.processo.ui.LeafInputField;
 
 import com.evolute.utils.tables.BaseTable;
 import com.evolute.utils.tables.ColumnizedMappable;
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java
index eeafeed7..dcef95b4 100755
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java
@@ -11,6 +11,7 @@ import java.util.Map;
 
 import javax.swing.JSeparator;
 
+import leaf.LeafOptionDialog;
 import leaf.LeafWindow;
 import leaf.LeafLogic.LeafUIActionBinding;
 
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java
index 343db7e9..cff59476 100755
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java
@@ -29,6 +29,7 @@ import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
+import leaf.LeafButton;
 import leaf.LeafWindow;
 import leaf.LeafWindow.ActionActivation;
 
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
index 869d35f9..fc1c8c73 100755
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
@@ -48,6 +48,10 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
+import leaf.LeafCalendarDialog;
+import leaf.LeafInputField;
+import leaf.LeafOptionDialog;
+import leaf.LeafTextDialog;
 import leaf.LeafWindow;
 import leaf.LeafLogic.LeafUIActionBinding;
 import leaf.LeafWindow.ActionActivation;