diff --git a/trunk/.classpath b/trunk/.classpath
new file mode 100644
index 00000000..32c17342
--- /dev/null
+++ b/trunk/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/trunk/.project b/trunk/.project
new file mode 100644
index 00000000..200965fb
--- /dev/null
+++ b/trunk/.project
@@ -0,0 +1,17 @@
+
+
+ SIPRP
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/trunk/alter3.sql b/trunk/SIPRPSoft/src/alter3.sql
similarity index 100%
rename from trunk/alter3.sql
rename to trunk/SIPRPSoft/src/alter3.sql
diff --git a/trunk/alter_20060516.sql b/trunk/SIPRPSoft/src/alter_20060516.sql
similarity index 100%
rename from trunk/alter_20060516.sql
rename to trunk/SIPRPSoft/src/alter_20060516.sql
diff --git a/trunk/alter_20070124.sql b/trunk/SIPRPSoft/src/alter_20070124.sql
similarity index 100%
rename from trunk/alter_20070124.sql
rename to trunk/SIPRPSoft/src/alter_20070124.sql
diff --git a/trunk/alter_20070221.sql b/trunk/SIPRPSoft/src/alter_20070221.sql
similarity index 100%
rename from trunk/alter_20070221.sql
rename to trunk/SIPRPSoft/src/alter_20070221.sql
diff --git a/trunk/build.xml b/trunk/SIPRPSoft/src/build.xml
similarity index 100%
rename from trunk/build.xml
rename to trunk/SIPRPSoft/src/build.xml
diff --git a/trunk/jpox_siprp.bat b/trunk/SIPRPSoft/src/jpox_siprp.bat
similarity index 100%
rename from trunk/jpox_siprp.bat
rename to trunk/SIPRPSoft/src/jpox_siprp.bat
diff --git a/trunk/jpox_siprp.sh b/trunk/SIPRPSoft/src/jpox_siprp.sh
similarity index 100%
rename from trunk/jpox_siprp.sh
rename to trunk/SIPRPSoft/src/jpox_siprp.sh
diff --git a/trunk/jws/siprp.jnlp b/trunk/SIPRPSoft/src/jws/siprp.jnlp
similarity index 100%
rename from trunk/jws/siprp.jnlp
rename to trunk/SIPRPSoft/src/jws/siprp.jnlp
diff --git a/trunk/log4j.properties b/trunk/SIPRPSoft/src/log4j.properties
similarity index 100%
rename from trunk/log4j.properties
rename to trunk/SIPRPSoft/src/log4j.properties
diff --git a/trunk/logo/logo_combo.jpg b/trunk/SIPRPSoft/src/logo/logo_combo.jpg
similarity index 100%
rename from trunk/logo/logo_combo.jpg
rename to trunk/SIPRPSoft/src/logo/logo_combo.jpg
diff --git a/trunk/logo/logo_w400.jpg b/trunk/SIPRPSoft/src/logo/logo_w400.jpg
similarity index 100%
rename from trunk/logo/logo_w400.jpg
rename to trunk/SIPRPSoft/src/logo/logo_w400.jpg
diff --git a/trunk/logo/logo_w400.png b/trunk/SIPRPSoft/src/logo/logo_w400.png
similarity index 100%
rename from trunk/logo/logo_w400.png
rename to trunk/SIPRPSoft/src/logo/logo_w400.png
diff --git a/trunk/logo_combo.jpg b/trunk/SIPRPSoft/src/logo_combo.jpg
similarity index 100%
rename from trunk/logo_combo.jpg
rename to trunk/SIPRPSoft/src/logo_combo.jpg
diff --git a/trunk/logo_evo.jpg b/trunk/SIPRPSoft/src/logo_evo.jpg
similarity index 100%
rename from trunk/logo_evo.jpg
rename to trunk/SIPRPSoft/src/logo_evo.jpg
diff --git a/trunk/siprp/CompanyDataLoader.java b/trunk/SIPRPSoft/src/siprp/CompanyDataLoader.java
similarity index 100%
rename from trunk/siprp/CompanyDataLoader.java
rename to trunk/SIPRPSoft/src/siprp/CompanyDataLoader.java
diff --git a/trunk/siprp/FichaDataProvider.java b/trunk/SIPRPSoft/src/siprp/FichaDataProvider.java
similarity index 100%
rename from trunk/siprp/FichaDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/FichaDataProvider.java
diff --git a/trunk/siprp/Main.java b/trunk/SIPRPSoft/src/siprp/Main.java
similarity index 100%
rename from trunk/siprp/Main.java
rename to trunk/SIPRPSoft/src/siprp/Main.java
diff --git a/trunk/siprp/SHSTLogger.java b/trunk/SIPRPSoft/src/siprp/SHSTLogger.java
similarity index 100%
rename from trunk/siprp/SHSTLogger.java
rename to trunk/SIPRPSoft/src/siprp/SHSTLogger.java
diff --git a/trunk/siprp/SIPRPTracker.java b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java
similarity index 100%
rename from trunk/siprp/SIPRPTracker.java
rename to trunk/SIPRPSoft/src/siprp/SIPRPTracker.java
diff --git a/trunk/siprp/SingletonConstants.java b/trunk/SIPRPSoft/src/siprp/SingletonConstants.java
similarity index 100%
rename from trunk/siprp/SingletonConstants.java
rename to trunk/SIPRPSoft/src/siprp/SingletonConstants.java
diff --git a/trunk/siprp/clientes/AvisosPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/AvisosPanel.java
similarity index 100%
rename from trunk/siprp/clientes/AvisosPanel.java
rename to trunk/SIPRPSoft/src/siprp/clientes/AvisosPanel.java
diff --git a/trunk/siprp/clientes/ClientesDataProvider.java b/trunk/SIPRPSoft/src/siprp/clientes/ClientesDataProvider.java
similarity index 100%
rename from trunk/siprp/clientes/ClientesDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/clientes/ClientesDataProvider.java
diff --git a/trunk/siprp/clientes/ClientesWindow.java b/trunk/SIPRPSoft/src/siprp/clientes/ClientesWindow.java
similarity index 100%
rename from trunk/siprp/clientes/ClientesWindow.java
rename to trunk/SIPRPSoft/src/siprp/clientes/ClientesWindow.java
diff --git a/trunk/siprp/clientes/ContactoPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/ContactoPanel.java
similarity index 100%
rename from trunk/siprp/clientes/ContactoPanel.java
rename to trunk/SIPRPSoft/src/siprp/clientes/ContactoPanel.java
diff --git a/trunk/siprp/clientes/EmpresaPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/EmpresaPanel.java
similarity index 100%
rename from trunk/siprp/clientes/EmpresaPanel.java
rename to trunk/SIPRPSoft/src/siprp/clientes/EmpresaPanel.java
diff --git a/trunk/siprp/clientes/EstabelecimentoPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/EstabelecimentoPanel.java
similarity index 100%
rename from trunk/siprp/clientes/EstabelecimentoPanel.java
rename to trunk/SIPRPSoft/src/siprp/clientes/EstabelecimentoPanel.java
diff --git a/trunk/siprp/clientes/EtiquetaChooserDialog.java b/trunk/SIPRPSoft/src/siprp/clientes/EtiquetaChooserDialog.java
similarity index 100%
rename from trunk/siprp/clientes/EtiquetaChooserDialog.java
rename to trunk/SIPRPSoft/src/siprp/clientes/EtiquetaChooserDialog.java
diff --git a/trunk/siprp/clientes/EtiquetaPrinter.java b/trunk/SIPRPSoft/src/siprp/clientes/EtiquetaPrinter.java
similarity index 100%
rename from trunk/siprp/clientes/EtiquetaPrinter.java
rename to trunk/SIPRPSoft/src/siprp/clientes/EtiquetaPrinter.java
diff --git a/trunk/siprp/clientes/HistoricoEstabelecimentoPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/HistoricoEstabelecimentoPanel.java
similarity index 100%
rename from trunk/siprp/clientes/HistoricoEstabelecimentoPanel.java
rename to trunk/SIPRPSoft/src/siprp/clientes/HistoricoEstabelecimentoPanel.java
diff --git a/trunk/siprp/clientes/MarcacaoEmpresaPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/MarcacaoEmpresaPanel.java
similarity index 100%
rename from trunk/siprp/clientes/MarcacaoEmpresaPanel.java
rename to trunk/SIPRPSoft/src/siprp/clientes/MarcacaoEmpresaPanel.java
diff --git a/trunk/siprp/clientes/MarcacaoPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/MarcacaoPanel.java
similarity index 100%
rename from trunk/siprp/clientes/MarcacaoPanel.java
rename to trunk/SIPRPSoft/src/siprp/clientes/MarcacaoPanel.java
diff --git a/trunk/siprp/clientes/NoticiasDataProvider.java b/trunk/SIPRPSoft/src/siprp/clientes/NoticiasDataProvider.java
similarity index 100%
rename from trunk/siprp/clientes/NoticiasDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/clientes/NoticiasDataProvider.java
diff --git a/trunk/siprp/clientes/NoticiasDialog.java b/trunk/SIPRPSoft/src/siprp/clientes/NoticiasDialog.java
similarity index 100%
rename from trunk/siprp/clientes/NoticiasDialog.java
rename to trunk/SIPRPSoft/src/siprp/clientes/NoticiasDialog.java
diff --git a/trunk/siprp/clientes/PerfilProtocoloPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/PerfilProtocoloPanel.java
similarity index 100%
rename from trunk/siprp/clientes/PerfilProtocoloPanel.java
rename to trunk/SIPRPSoft/src/siprp/clientes/PerfilProtocoloPanel.java
diff --git a/trunk/siprp/clientes/ProtocoloPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/ProtocoloPanel.java
similarity index 100%
rename from trunk/siprp/clientes/ProtocoloPanel.java
rename to trunk/SIPRPSoft/src/siprp/clientes/ProtocoloPanel.java
diff --git a/trunk/siprp/clientes/TrabalhadorPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/TrabalhadorPanel.java
similarity index 100%
rename from trunk/siprp/clientes/TrabalhadorPanel.java
rename to trunk/SIPRPSoft/src/siprp/clientes/TrabalhadorPanel.java
diff --git a/trunk/siprp/clientes/UserDataProvider.java b/trunk/SIPRPSoft/src/siprp/clientes/UserDataProvider.java
similarity index 100%
rename from trunk/siprp/clientes/UserDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/clientes/UserDataProvider.java
diff --git a/trunk/siprp/clientes/UserPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/UserPanel.java
similarity index 100%
rename from trunk/siprp/clientes/UserPanel.java
rename to trunk/SIPRPSoft/src/siprp/clientes/UserPanel.java
diff --git a/trunk/siprp/clientes/UserWindow.java b/trunk/SIPRPSoft/src/siprp/clientes/UserWindow.java
similarity index 100%
rename from trunk/siprp/clientes/UserWindow.java
rename to trunk/SIPRPSoft/src/siprp/clientes/UserWindow.java
diff --git a/trunk/siprp/clientes/etiqueta.xsl b/trunk/SIPRPSoft/src/siprp/clientes/etiqueta.xsl
similarity index 100%
rename from trunk/siprp/clientes/etiqueta.xsl
rename to trunk/SIPRPSoft/src/siprp/clientes/etiqueta.xsl
diff --git a/trunk/siprp/clientes/etiquetas.dtd b/trunk/SIPRPSoft/src/siprp/clientes/etiquetas.dtd
similarity index 100%
rename from trunk/siprp/clientes/etiquetas.dtd
rename to trunk/SIPRPSoft/src/siprp/clientes/etiquetas.dtd
diff --git a/trunk/siprp/companydataloaders/ClinicaAvenidaDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/ClinicaAvenidaDataLoader.java
similarity index 100%
rename from trunk/siprp/companydataloaders/ClinicaAvenidaDataLoader.java
rename to trunk/SIPRPSoft/src/siprp/companydataloaders/ClinicaAvenidaDataLoader.java
diff --git a/trunk/siprp/companydataloaders/IBookDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/IBookDataLoader.java
similarity index 100%
rename from trunk/siprp/companydataloaders/IBookDataLoader.java
rename to trunk/SIPRPSoft/src/siprp/companydataloaders/IBookDataLoader.java
diff --git a/trunk/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
similarity index 100%
rename from trunk/siprp/companydataloaders/SIPRPDataLoader.java
rename to trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
diff --git a/trunk/siprp/data/ActualizacaoSaveHandler.java b/trunk/SIPRPSoft/src/siprp/data/ActualizacaoSaveHandler.java
similarity index 100%
rename from trunk/siprp/data/ActualizacaoSaveHandler.java
rename to trunk/SIPRPSoft/src/siprp/data/ActualizacaoSaveHandler.java
diff --git a/trunk/siprp/data/ActualizacaoSaveable.java b/trunk/SIPRPSoft/src/siprp/data/ActualizacaoSaveable.java
similarity index 100%
rename from trunk/siprp/data/ActualizacaoSaveable.java
rename to trunk/SIPRPSoft/src/siprp/data/ActualizacaoSaveable.java
diff --git a/trunk/siprp/data/Aviso.java b/trunk/SIPRPSoft/src/siprp/data/Aviso.java
similarity index 100%
rename from trunk/siprp/data/Aviso.java
rename to trunk/SIPRPSoft/src/siprp/data/Aviso.java
diff --git a/trunk/siprp/data/AvisoConstants.java b/trunk/SIPRPSoft/src/siprp/data/AvisoConstants.java
similarity index 100%
rename from trunk/siprp/data/AvisoConstants.java
rename to trunk/SIPRPSoft/src/siprp/data/AvisoConstants.java
diff --git a/trunk/siprp/data/AvisoData.java b/trunk/SIPRPSoft/src/siprp/data/AvisoData.java
similarity index 100%
rename from trunk/siprp/data/AvisoData.java
rename to trunk/SIPRPSoft/src/siprp/data/AvisoData.java
diff --git a/trunk/siprp/data/AvisoID.java b/trunk/SIPRPSoft/src/siprp/data/AvisoID.java
similarity index 100%
rename from trunk/siprp/data/AvisoID.java
rename to trunk/SIPRPSoft/src/siprp/data/AvisoID.java
diff --git a/trunk/siprp/data/Contacto.java b/trunk/SIPRPSoft/src/siprp/data/Contacto.java
similarity index 100%
rename from trunk/siprp/data/Contacto.java
rename to trunk/SIPRPSoft/src/siprp/data/Contacto.java
diff --git a/trunk/siprp/data/ContactoData.java b/trunk/SIPRPSoft/src/siprp/data/ContactoData.java
similarity index 100%
rename from trunk/siprp/data/ContactoData.java
rename to trunk/SIPRPSoft/src/siprp/data/ContactoData.java
diff --git a/trunk/siprp/data/ContactoID.java b/trunk/SIPRPSoft/src/siprp/data/ContactoID.java
similarity index 100%
rename from trunk/siprp/data/ContactoID.java
rename to trunk/SIPRPSoft/src/siprp/data/ContactoID.java
diff --git a/trunk/siprp/data/DisableDeleteHandler.java b/trunk/SIPRPSoft/src/siprp/data/DisableDeleteHandler.java
similarity index 100%
rename from trunk/siprp/data/DisableDeleteHandler.java
rename to trunk/SIPRPSoft/src/siprp/data/DisableDeleteHandler.java
diff --git a/trunk/siprp/data/DisableDeleteable.java b/trunk/SIPRPSoft/src/siprp/data/DisableDeleteable.java
similarity index 100%
rename from trunk/siprp/data/DisableDeleteable.java
rename to trunk/SIPRPSoft/src/siprp/data/DisableDeleteable.java
diff --git a/trunk/siprp/data/Empresa.java b/trunk/SIPRPSoft/src/siprp/data/Empresa.java
similarity index 100%
rename from trunk/siprp/data/Empresa.java
rename to trunk/SIPRPSoft/src/siprp/data/Empresa.java
diff --git a/trunk/siprp/data/EmpresaData.java b/trunk/SIPRPSoft/src/siprp/data/EmpresaData.java
similarity index 100%
rename from trunk/siprp/data/EmpresaData.java
rename to trunk/SIPRPSoft/src/siprp/data/EmpresaData.java
diff --git a/trunk/siprp/data/EmpresaID.java b/trunk/SIPRPSoft/src/siprp/data/EmpresaID.java
similarity index 100%
rename from trunk/siprp/data/EmpresaID.java
rename to trunk/SIPRPSoft/src/siprp/data/EmpresaID.java
diff --git a/trunk/siprp/data/Estabelecimento.java b/trunk/SIPRPSoft/src/siprp/data/Estabelecimento.java
similarity index 100%
rename from trunk/siprp/data/Estabelecimento.java
rename to trunk/SIPRPSoft/src/siprp/data/Estabelecimento.java
diff --git a/trunk/siprp/data/EstabelecimentoData.java b/trunk/SIPRPSoft/src/siprp/data/EstabelecimentoData.java
similarity index 100%
rename from trunk/siprp/data/EstabelecimentoData.java
rename to trunk/SIPRPSoft/src/siprp/data/EstabelecimentoData.java
diff --git a/trunk/siprp/data/EstabelecimentoID.java b/trunk/SIPRPSoft/src/siprp/data/EstabelecimentoID.java
similarity index 100%
rename from trunk/siprp/data/EstabelecimentoID.java
rename to trunk/SIPRPSoft/src/siprp/data/EstabelecimentoID.java
diff --git a/trunk/siprp/data/Etiqueta.java b/trunk/SIPRPSoft/src/siprp/data/Etiqueta.java
similarity index 100%
rename from trunk/siprp/data/Etiqueta.java
rename to trunk/SIPRPSoft/src/siprp/data/Etiqueta.java
diff --git a/trunk/siprp/data/EtiquetaData.java b/trunk/SIPRPSoft/src/siprp/data/EtiquetaData.java
similarity index 100%
rename from trunk/siprp/data/EtiquetaData.java
rename to trunk/SIPRPSoft/src/siprp/data/EtiquetaData.java
diff --git a/trunk/siprp/data/EtiquetaID.java b/trunk/SIPRPSoft/src/siprp/data/EtiquetaID.java
similarity index 100%
rename from trunk/siprp/data/EtiquetaID.java
rename to trunk/SIPRPSoft/src/siprp/data/EtiquetaID.java
diff --git a/trunk/siprp/data/Exame.java b/trunk/SIPRPSoft/src/siprp/data/Exame.java
similarity index 100%
rename from trunk/siprp/data/Exame.java
rename to trunk/SIPRPSoft/src/siprp/data/Exame.java
diff --git a/trunk/siprp/data/ExameData.java b/trunk/SIPRPSoft/src/siprp/data/ExameData.java
similarity index 100%
rename from trunk/siprp/data/ExameData.java
rename to trunk/SIPRPSoft/src/siprp/data/ExameData.java
diff --git a/trunk/siprp/data/ExameID.java b/trunk/SIPRPSoft/src/siprp/data/ExameID.java
similarity index 100%
rename from trunk/siprp/data/ExameID.java
rename to trunk/SIPRPSoft/src/siprp/data/ExameID.java
diff --git a/trunk/siprp/data/Historico.java b/trunk/SIPRPSoft/src/siprp/data/Historico.java
similarity index 100%
rename from trunk/siprp/data/Historico.java
rename to trunk/SIPRPSoft/src/siprp/data/Historico.java
diff --git a/trunk/siprp/data/HistoricoEstabelecimento.java b/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimento.java
similarity index 100%
rename from trunk/siprp/data/HistoricoEstabelecimento.java
rename to trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimento.java
diff --git a/trunk/siprp/data/HistoricoEstabelecimentoData.java b/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoData.java
similarity index 100%
rename from trunk/siprp/data/HistoricoEstabelecimentoData.java
rename to trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoData.java
diff --git a/trunk/siprp/data/HistoricoEstabelecimentoID.java b/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoID.java
similarity index 100%
rename from trunk/siprp/data/HistoricoEstabelecimentoID.java
rename to trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoID.java
diff --git a/trunk/siprp/data/Marcacao.java b/trunk/SIPRPSoft/src/siprp/data/Marcacao.java
similarity index 100%
rename from trunk/siprp/data/Marcacao.java
rename to trunk/SIPRPSoft/src/siprp/data/Marcacao.java
diff --git a/trunk/siprp/data/MarcacaoEmpresa.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresa.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoEmpresa.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresa.java
diff --git a/trunk/siprp/data/MarcacaoEmpresaData.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaData.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoEmpresaData.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaData.java
diff --git a/trunk/siprp/data/MarcacaoEmpresaID.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaID.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoEmpresaID.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaID.java
diff --git a/trunk/siprp/data/MarcacaoEstabelecimento.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimento.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoEstabelecimento.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimento.java
diff --git a/trunk/siprp/data/MarcacaoEstabelecimentoData.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoData.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoEstabelecimentoData.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoData.java
diff --git a/trunk/siprp/data/MarcacaoEstabelecimentoID.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoID.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoEstabelecimentoID.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoID.java
diff --git a/trunk/siprp/data/MarcacaoListLoader.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoListLoader.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoListLoader.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoListLoader.java
diff --git a/trunk/siprp/data/MarcacaoSaveAndDeleteHandler.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoSaveAndDeleteHandler.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoSaveAndDeleteHandler.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoSaveAndDeleteHandler.java
diff --git a/trunk/siprp/data/MarcacaoTrabalhador.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhador.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoTrabalhador.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhador.java
diff --git a/trunk/siprp/data/MarcacaoTrabalhadorConstants.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorConstants.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoTrabalhadorConstants.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorConstants.java
diff --git a/trunk/siprp/data/MarcacaoTrabalhadorData.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorData.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoTrabalhadorData.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorData.java
diff --git a/trunk/siprp/data/MarcacaoTrabalhadorID.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorID.java
similarity index 100%
rename from trunk/siprp/data/MarcacaoTrabalhadorID.java
rename to trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorID.java
diff --git a/trunk/siprp/data/Medico.java b/trunk/SIPRPSoft/src/siprp/data/Medico.java
similarity index 100%
rename from trunk/siprp/data/Medico.java
rename to trunk/SIPRPSoft/src/siprp/data/Medico.java
diff --git a/trunk/siprp/data/MedicoData.java b/trunk/SIPRPSoft/src/siprp/data/MedicoData.java
similarity index 100%
rename from trunk/siprp/data/MedicoData.java
rename to trunk/SIPRPSoft/src/siprp/data/MedicoData.java
diff --git a/trunk/siprp/data/MedicoID.java b/trunk/SIPRPSoft/src/siprp/data/MedicoID.java
similarity index 100%
rename from trunk/siprp/data/MedicoID.java
rename to trunk/SIPRPSoft/src/siprp/data/MedicoID.java
diff --git a/trunk/siprp/data/SearchExecuterFactory.java b/trunk/SIPRPSoft/src/siprp/data/SearchExecuterFactory.java
similarity index 100%
rename from trunk/siprp/data/SearchExecuterFactory.java
rename to trunk/SIPRPSoft/src/siprp/data/SearchExecuterFactory.java
diff --git a/trunk/siprp/data/TecnicoHST.java b/trunk/SIPRPSoft/src/siprp/data/TecnicoHST.java
similarity index 100%
rename from trunk/siprp/data/TecnicoHST.java
rename to trunk/SIPRPSoft/src/siprp/data/TecnicoHST.java
diff --git a/trunk/siprp/data/TecnicoHSTData.java b/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTData.java
similarity index 100%
rename from trunk/siprp/data/TecnicoHSTData.java
rename to trunk/SIPRPSoft/src/siprp/data/TecnicoHSTData.java
diff --git a/trunk/siprp/data/TecnicoHSTID.java b/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTID.java
similarity index 100%
rename from trunk/siprp/data/TecnicoHSTID.java
rename to trunk/SIPRPSoft/src/siprp/data/TecnicoHSTID.java
diff --git a/trunk/siprp/data/Trabalhador.java b/trunk/SIPRPSoft/src/siprp/data/Trabalhador.java
similarity index 100%
rename from trunk/siprp/data/Trabalhador.java
rename to trunk/SIPRPSoft/src/siprp/data/Trabalhador.java
diff --git a/trunk/siprp/data/TrabalhadorData.java b/trunk/SIPRPSoft/src/siprp/data/TrabalhadorData.java
similarity index 100%
rename from trunk/siprp/data/TrabalhadorData.java
rename to trunk/SIPRPSoft/src/siprp/data/TrabalhadorData.java
diff --git a/trunk/siprp/data/TrabalhadorID.java b/trunk/SIPRPSoft/src/siprp/data/TrabalhadorID.java
similarity index 100%
rename from trunk/siprp/data/TrabalhadorID.java
rename to trunk/SIPRPSoft/src/siprp/data/TrabalhadorID.java
diff --git a/trunk/siprp/data/package.jdo b/trunk/SIPRPSoft/src/siprp/data/package.jdo
similarity index 100%
rename from trunk/siprp/data/package.jdo
rename to trunk/SIPRPSoft/src/siprp/data/package.jdo
diff --git a/trunk/siprp/estatistica/EstatisticaDataProvider.java b/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaDataProvider.java
similarity index 100%
rename from trunk/siprp/estatistica/EstatisticaDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaDataProvider.java
diff --git a/trunk/siprp/estatistica/EstatisticaWindow.java b/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java
similarity index 100%
rename from trunk/siprp/estatistica/EstatisticaWindow.java
rename to trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java
diff --git a/trunk/siprp/estatisticas/EstatisticasWindow.java b/trunk/SIPRPSoft/src/siprp/estatisticas/EstatisticasWindow.java
similarity index 100%
rename from trunk/siprp/estatisticas/EstatisticasWindow.java
rename to trunk/SIPRPSoft/src/siprp/estatisticas/EstatisticasWindow.java
diff --git a/trunk/siprp/ficha/EmpresaPanel.java b/trunk/SIPRPSoft/src/siprp/ficha/EmpresaPanel.java
similarity index 100%
rename from trunk/siprp/ficha/EmpresaPanel.java
rename to trunk/SIPRPSoft/src/siprp/ficha/EmpresaPanel.java
diff --git a/trunk/siprp/ficha/ExamePDF.java b/trunk/SIPRPSoft/src/siprp/ficha/ExamePDF.java
similarity index 100%
rename from trunk/siprp/ficha/ExamePDF.java
rename to trunk/SIPRPSoft/src/siprp/ficha/ExamePDF.java
diff --git a/trunk/siprp/ficha/ExamePanel.java b/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java
similarity index 100%
rename from trunk/siprp/ficha/ExamePanel.java
rename to trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java
diff --git a/trunk/siprp/ficha/FichaAptidaoConstants.java b/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoConstants.java
similarity index 100%
rename from trunk/siprp/ficha/FichaAptidaoConstants.java
rename to trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoConstants.java
diff --git a/trunk/siprp/ficha/FichaAptidaoCreator.java b/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoCreator.java
similarity index 100%
rename from trunk/siprp/ficha/FichaAptidaoCreator.java
rename to trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoCreator.java
diff --git a/trunk/siprp/ficha/FichaAptidaoEditorManager.java b/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManager.java
similarity index 100%
rename from trunk/siprp/ficha/FichaAptidaoEditorManager.java
rename to trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManager.java
diff --git a/trunk/siprp/ficha/FichaAptidaoEditorManagerFactory.java b/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManagerFactory.java
similarity index 100%
rename from trunk/siprp/ficha/FichaAptidaoEditorManagerFactory.java
rename to trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManagerFactory.java
diff --git a/trunk/siprp/ficha/FichaWindow.java b/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java
similarity index 100%
rename from trunk/siprp/ficha/FichaWindow.java
rename to trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java
diff --git a/trunk/siprp/ficha/MedicoColumnizedObject.java b/trunk/SIPRPSoft/src/siprp/ficha/MedicoColumnizedObject.java
similarity index 100%
rename from trunk/siprp/ficha/MedicoColumnizedObject.java
rename to trunk/SIPRPSoft/src/siprp/ficha/MedicoColumnizedObject.java
diff --git a/trunk/siprp/ficha/MedicoEditor.java b/trunk/SIPRPSoft/src/siprp/ficha/MedicoEditor.java
similarity index 100%
rename from trunk/siprp/ficha/MedicoEditor.java
rename to trunk/SIPRPSoft/src/siprp/ficha/MedicoEditor.java
diff --git a/trunk/siprp/ficha/ObservacoesPanel.java b/trunk/SIPRPSoft/src/siprp/ficha/ObservacoesPanel.java
similarity index 100%
rename from trunk/siprp/ficha/ObservacoesPanel.java
rename to trunk/SIPRPSoft/src/siprp/ficha/ObservacoesPanel.java
diff --git a/trunk/siprp/ficha/RecomendacoesPanel.java b/trunk/SIPRPSoft/src/siprp/ficha/RecomendacoesPanel.java
similarity index 100%
rename from trunk/siprp/ficha/RecomendacoesPanel.java
rename to trunk/SIPRPSoft/src/siprp/ficha/RecomendacoesPanel.java
diff --git a/trunk/siprp/ficha/SaveExameListener.java b/trunk/SIPRPSoft/src/siprp/ficha/SaveExameListener.java
similarity index 100%
rename from trunk/siprp/ficha/SaveExameListener.java
rename to trunk/SIPRPSoft/src/siprp/ficha/SaveExameListener.java
diff --git a/trunk/siprp/ficha/TrabalhadorPanel.java b/trunk/SIPRPSoft/src/siprp/ficha/TrabalhadorPanel.java
similarity index 100%
rename from trunk/siprp/ficha/TrabalhadorPanel.java
rename to trunk/SIPRPSoft/src/siprp/ficha/TrabalhadorPanel.java
diff --git a/trunk/siprp/ficha/UpperPanel.java b/trunk/SIPRPSoft/src/siprp/ficha/UpperPanel.java
similarity index 100%
rename from trunk/siprp/ficha/UpperPanel.java
rename to trunk/SIPRPSoft/src/siprp/ficha/UpperPanel.java
diff --git a/trunk/siprp/ficha/ValuesException.java b/trunk/SIPRPSoft/src/siprp/ficha/ValuesException.java
similarity index 100%
rename from trunk/siprp/ficha/ValuesException.java
rename to trunk/SIPRPSoft/src/siprp/ficha/ValuesException.java
diff --git a/trunk/siprp/ficha/ficha_aptidao.xsl b/trunk/SIPRPSoft/src/siprp/ficha/ficha_aptidao.xsl
similarity index 100%
rename from trunk/siprp/ficha/ficha_aptidao.xsl
rename to trunk/SIPRPSoft/src/siprp/ficha/ficha_aptidao.xsl
diff --git a/trunk/siprp/ficha/svg/char_square_pure.svg b/trunk/SIPRPSoft/src/siprp/ficha/svg/char_square_pure.svg
similarity index 100%
rename from trunk/siprp/ficha/svg/char_square_pure.svg
rename to trunk/SIPRPSoft/src/siprp/ficha/svg/char_square_pure.svg
diff --git a/trunk/siprp/ficha/svg/char_tick_pure.svg b/trunk/SIPRPSoft/src/siprp/ficha/svg/char_tick_pure.svg
similarity index 100%
rename from trunk/siprp/ficha/svg/char_tick_pure.svg
rename to trunk/SIPRPSoft/src/siprp/ficha/svg/char_tick_pure.svg
diff --git a/trunk/siprp/higiene/HigieneDataProvider.java b/trunk/SIPRPSoft/src/siprp/higiene/HigieneDataProvider.java
similarity index 100%
rename from trunk/siprp/higiene/HigieneDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/higiene/HigieneDataProvider.java
diff --git a/trunk/siprp/higiene/alter2.sql b/trunk/SIPRPSoft/src/siprp/higiene/alter2.sql
similarity index 100%
rename from trunk/siprp/higiene/alter2.sql
rename to trunk/SIPRPSoft/src/siprp/higiene/alter2.sql
diff --git a/trunk/siprp/higiene/mapa/DiaLine.java b/trunk/SIPRPSoft/src/siprp/higiene/mapa/DiaLine.java
similarity index 100%
rename from trunk/siprp/higiene/mapa/DiaLine.java
rename to trunk/SIPRPSoft/src/siprp/higiene/mapa/DiaLine.java
diff --git a/trunk/siprp/higiene/mapa/DiaPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/mapa/DiaPanel.java
similarity index 100%
rename from trunk/siprp/higiene/mapa/DiaPanel.java
rename to trunk/SIPRPSoft/src/siprp/higiene/mapa/DiaPanel.java
diff --git a/trunk/siprp/higiene/mapa/DiaRenderer.java b/trunk/SIPRPSoft/src/siprp/higiene/mapa/DiaRenderer.java
similarity index 100%
rename from trunk/siprp/higiene/mapa/DiaRenderer.java
rename to trunk/SIPRPSoft/src/siprp/higiene/mapa/DiaRenderer.java
diff --git a/trunk/siprp/higiene/mapa/MapaHigienePanel.java b/trunk/SIPRPSoft/src/siprp/higiene/mapa/MapaHigienePanel.java
similarity index 100%
rename from trunk/siprp/higiene/mapa/MapaHigienePanel.java
rename to trunk/SIPRPSoft/src/siprp/higiene/mapa/MapaHigienePanel.java
diff --git a/trunk/siprp/higiene/mapa/MapaHigieneWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/mapa/MapaHigieneWindow.java
similarity index 100%
rename from trunk/siprp/higiene/mapa/MapaHigieneWindow.java
rename to trunk/SIPRPSoft/src/siprp/higiene/mapa/MapaHigieneWindow.java
diff --git a/trunk/siprp/higiene/mapa/TecnicosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/mapa/TecnicosPanel.java
similarity index 100%
rename from trunk/siprp/higiene/mapa/TecnicosPanel.java
rename to trunk/SIPRPSoft/src/siprp/higiene/mapa/TecnicosPanel.java
diff --git a/trunk/siprp/higiene/marcacoes/CorTecnicoCellRenderer.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/CorTecnicoCellRenderer.java
similarity index 100%
rename from trunk/siprp/higiene/marcacoes/CorTecnicoCellRenderer.java
rename to trunk/SIPRPSoft/src/siprp/higiene/marcacoes/CorTecnicoCellRenderer.java
diff --git a/trunk/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java
similarity index 100%
rename from trunk/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java
rename to trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java
diff --git a/trunk/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.xml b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.xml
similarity index 100%
rename from trunk/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.xml
rename to trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.xml
diff --git a/trunk/siprp/higiene/marcacoes/MarcacoesHigieneUpperPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneUpperPanel.java
similarity index 100%
rename from trunk/siprp/higiene/marcacoes/MarcacoesHigieneUpperPanel.java
rename to trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneUpperPanel.java
diff --git a/trunk/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java
similarity index 100%
rename from trunk/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java
rename to trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java
diff --git a/trunk/siprp/higiene/marcacoes/TecnicoEditor.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoEditor.java
similarity index 100%
rename from trunk/siprp/higiene/marcacoes/TecnicoEditor.java
rename to trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoEditor.java
diff --git a/trunk/siprp/higiene/marcacoes/TecnicoRenderer.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoRenderer.java
similarity index 100%
rename from trunk/siprp/higiene/marcacoes/TecnicoRenderer.java
rename to trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoRenderer.java
diff --git a/trunk/siprp/importer/DataChooserWindow.java b/trunk/SIPRPSoft/src/siprp/importer/DataChooserWindow.java
similarity index 100%
rename from trunk/siprp/importer/DataChooserWindow.java
rename to trunk/SIPRPSoft/src/siprp/importer/DataChooserWindow.java
diff --git a/trunk/siprp/importer/Importer.java b/trunk/SIPRPSoft/src/siprp/importer/Importer.java
similarity index 100%
rename from trunk/siprp/importer/Importer.java
rename to trunk/SIPRPSoft/src/siprp/importer/Importer.java
diff --git a/trunk/siprp/impressaofichas/FichasPrinter.java b/trunk/SIPRPSoft/src/siprp/impressaofichas/FichasPrinter.java
similarity index 100%
rename from trunk/siprp/impressaofichas/FichasPrinter.java
rename to trunk/SIPRPSoft/src/siprp/impressaofichas/FichasPrinter.java
diff --git a/trunk/siprp/impressaofichas/ImpressaoFichasDataProvider.java b/trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasDataProvider.java
similarity index 100%
rename from trunk/siprp/impressaofichas/ImpressaoFichasDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasDataProvider.java
diff --git a/trunk/siprp/impressaofichas/ImpressaoFichasWindow.java b/trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasWindow.java
similarity index 100%
rename from trunk/siprp/impressaofichas/ImpressaoFichasWindow.java
rename to trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasWindow.java
diff --git a/trunk/siprp/impressaofichas/lista_fichas.xsl b/trunk/SIPRPSoft/src/siprp/impressaofichas/lista_fichas.xsl
similarity index 100%
rename from trunk/siprp/impressaofichas/lista_fichas.xsl
rename to trunk/SIPRPSoft/src/siprp/impressaofichas/lista_fichas.xsl
diff --git a/trunk/siprp/lembretes/Lembrete.java b/trunk/SIPRPSoft/src/siprp/lembretes/Lembrete.java
similarity index 100%
rename from trunk/siprp/lembretes/Lembrete.java
rename to trunk/SIPRPSoft/src/siprp/lembretes/Lembrete.java
diff --git a/trunk/siprp/lembretes/LembretesConstants.java b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesConstants.java
similarity index 100%
rename from trunk/siprp/lembretes/LembretesConstants.java
rename to trunk/SIPRPSoft/src/siprp/lembretes/LembretesConstants.java
diff --git a/trunk/siprp/lembretes/LembretesDataProvider.java b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesDataProvider.java
similarity index 100%
rename from trunk/siprp/lembretes/LembretesDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/lembretes/LembretesDataProvider.java
diff --git a/trunk/siprp/lembretes/LembretesPanel.java b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesPanel.java
similarity index 100%
rename from trunk/siprp/lembretes/LembretesPanel.java
rename to trunk/SIPRPSoft/src/siprp/lembretes/LembretesPanel.java
diff --git a/trunk/siprp/lembretes/LembretesWindow.java b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java
similarity index 100%
rename from trunk/siprp/lembretes/LembretesWindow.java
rename to trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java
diff --git a/trunk/siprp/lembretes/TipoLembrete.java b/trunk/SIPRPSoft/src/siprp/lembretes/TipoLembrete.java
similarity index 100%
rename from trunk/siprp/lembretes/TipoLembrete.java
rename to trunk/SIPRPSoft/src/siprp/lembretes/TipoLembrete.java
diff --git a/trunk/siprp/lembretes/remarcacoes/LembretesRemarcacaoPanel.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/LembretesRemarcacaoPanel.java
similarity index 100%
rename from trunk/siprp/lembretes/remarcacoes/LembretesRemarcacaoPanel.java
rename to trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/LembretesRemarcacaoPanel.java
diff --git a/trunk/siprp/lembretes/remarcacoes/RemarcacoesActionFactory.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesActionFactory.java
similarity index 100%
rename from trunk/siprp/lembretes/remarcacoes/RemarcacoesActionFactory.java
rename to trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesActionFactory.java
diff --git a/trunk/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java
similarity index 100%
rename from trunk/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java
diff --git a/trunk/siprp/lembretes/remarcacoes/actions/TratarMarcacaoEstabelecimentoAction.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoEstabelecimentoAction.java
similarity index 100%
rename from trunk/siprp/lembretes/remarcacoes/actions/TratarMarcacaoEstabelecimentoAction.java
rename to trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoEstabelecimentoAction.java
diff --git a/trunk/siprp/lembretes/remarcacoes/actions/TratarMarcacaoTrabalhadorAction.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoTrabalhadorAction.java
similarity index 100%
rename from trunk/siprp/lembretes/remarcacoes/actions/TratarMarcacaoTrabalhadorAction.java
rename to trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoTrabalhadorAction.java
diff --git a/trunk/siprp/medicina/MarcacaoConsultaExtendedPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaExtendedPanel.java
similarity index 100%
rename from trunk/siprp/medicina/MarcacaoConsultaExtendedPanel.java
rename to trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaExtendedPanel.java
diff --git a/trunk/siprp/medicina/MarcacaoConsultaPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.java
similarity index 100%
rename from trunk/siprp/medicina/MarcacaoConsultaPanel.java
rename to trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.java
diff --git a/trunk/siprp/medicina/MarcacaoConsultaPanel.xml b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.xml
similarity index 100%
rename from trunk/siprp/medicina/MarcacaoConsultaPanel.xml
rename to trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.xml
diff --git a/trunk/siprp/medicina/MarcacaoExamePanel.java b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.java
similarity index 100%
rename from trunk/siprp/medicina/MarcacaoExamePanel.java
rename to trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.java
diff --git a/trunk/siprp/medicina/MarcacaoExamePanel.xml b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.xml
similarity index 100%
rename from trunk/siprp/medicina/MarcacaoExamePanel.xml
rename to trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.xml
diff --git a/trunk/siprp/medicina/MarcacoesMedicinaHandler.java b/trunk/SIPRPSoft/src/siprp/medicina/MarcacoesMedicinaHandler.java
similarity index 100%
rename from trunk/siprp/medicina/MarcacoesMedicinaHandler.java
rename to trunk/SIPRPSoft/src/siprp/medicina/MarcacoesMedicinaHandler.java
diff --git a/trunk/siprp/medicina/MedicinaConstants.java b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaConstants.java
similarity index 100%
rename from trunk/siprp/medicina/MedicinaConstants.java
rename to trunk/SIPRPSoft/src/siprp/medicina/MedicinaConstants.java
diff --git a/trunk/siprp/medicina/MedicinaDataProvider.java b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaDataProvider.java
similarity index 100%
rename from trunk/siprp/medicina/MedicinaDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/medicina/MedicinaDataProvider.java
diff --git a/trunk/siprp/medicina/MedicinaUpperPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaUpperPanel.java
similarity index 100%
rename from trunk/siprp/medicina/MedicinaUpperPanel.java
rename to trunk/SIPRPSoft/src/siprp/medicina/MedicinaUpperPanel.java
diff --git a/trunk/siprp/medicina/MedicinaWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java
similarity index 100%
rename from trunk/siprp/medicina/MedicinaWindow.java
rename to trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java
diff --git a/trunk/siprp/medicina/Test.java b/trunk/SIPRPSoft/src/siprp/medicina/Test.java
similarity index 100%
rename from trunk/siprp/medicina/Test.java
rename to trunk/SIPRPSoft/src/siprp/medicina/Test.java
diff --git a/trunk/siprp/medicina/alter.sql b/trunk/SIPRPSoft/src/siprp/medicina/alter.sql
similarity index 100%
rename from trunk/siprp/medicina/alter.sql
rename to trunk/SIPRPSoft/src/siprp/medicina/alter.sql
diff --git a/trunk/siprp/medicina/locais_realizacao/FaxPrinter.java b/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/FaxPrinter.java
similarity index 100%
rename from trunk/siprp/medicina/locais_realizacao/FaxPrinter.java
rename to trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/FaxPrinter.java
diff --git a/trunk/siprp/medicina/locais_realizacao/LocaisRealizacaoDataProvider.java b/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/LocaisRealizacaoDataProvider.java
similarity index 100%
rename from trunk/siprp/medicina/locais_realizacao/LocaisRealizacaoDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/LocaisRealizacaoDataProvider.java
diff --git a/trunk/siprp/medicina/locais_realizacao/LocaisRealizacaoWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/LocaisRealizacaoWindow.java
similarity index 100%
rename from trunk/siprp/medicina/locais_realizacao/LocaisRealizacaoWindow.java
rename to trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/LocaisRealizacaoWindow.java
diff --git a/trunk/siprp/medicina/locais_realizacao/fax_ecds.xsl b/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/fax_ecds.xsl
similarity index 100%
rename from trunk/siprp/medicina/locais_realizacao/fax_ecds.xsl
rename to trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/fax_ecds.xsl
diff --git a/trunk/siprp/medicina/locais_realizacao/fax_ecds_teste.xml b/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/fax_ecds_teste.xml
similarity index 100%
rename from trunk/siprp/medicina/locais_realizacao/fax_ecds_teste.xml
rename to trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/fax_ecds_teste.xml
diff --git a/trunk/siprp/medicina/presencas/DetalhesRealizacaoDialog.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/DetalhesRealizacaoDialog.java
similarity index 100%
rename from trunk/siprp/medicina/presencas/DetalhesRealizacaoDialog.java
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/DetalhesRealizacaoDialog.java
diff --git a/trunk/siprp/medicina/presencas/ImpressaoAuxiliaresWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/ImpressaoAuxiliaresWindow.java
similarity index 100%
rename from trunk/siprp/medicina/presencas/ImpressaoAuxiliaresWindow.java
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/ImpressaoAuxiliaresWindow.java
diff --git a/trunk/siprp/medicina/presencas/Presenca.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/Presenca.java
similarity index 100%
rename from trunk/siprp/medicina/presencas/Presenca.java
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/Presenca.java
diff --git a/trunk/siprp/medicina/presencas/PresencasActionFactory.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/PresencasActionFactory.java
similarity index 100%
rename from trunk/siprp/medicina/presencas/PresencasActionFactory.java
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/PresencasActionFactory.java
diff --git a/trunk/siprp/medicina/presencas/PresencasDataProvider.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/PresencasDataProvider.java
similarity index 100%
rename from trunk/siprp/medicina/presencas/PresencasDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/PresencasDataProvider.java
diff --git a/trunk/siprp/medicina/presencas/RegistarPresencasWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/RegistarPresencasWindow.java
similarity index 100%
rename from trunk/siprp/medicina/presencas/RegistarPresencasWindow.java
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/RegistarPresencasWindow.java
diff --git a/trunk/siprp/medicina/presencas/actions/DesmarcadoSHSTAction.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoSHSTAction.java
similarity index 100%
rename from trunk/siprp/medicina/presencas/actions/DesmarcadoSHSTAction.java
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoSHSTAction.java
diff --git a/trunk/siprp/medicina/presencas/actions/DesmarcadoTrabalhadorAction.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoTrabalhadorAction.java
similarity index 100%
rename from trunk/siprp/medicina/presencas/actions/DesmarcadoTrabalhadorAction.java
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoTrabalhadorAction.java
diff --git a/trunk/siprp/medicina/presencas/actions/FaltouAction.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/FaltouAction.java
similarity index 100%
rename from trunk/siprp/medicina/presencas/actions/FaltouAction.java
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/FaltouAction.java
diff --git a/trunk/siprp/medicina/presencas/actions/RealizouAction.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouAction.java
similarity index 100%
rename from trunk/siprp/medicina/presencas/actions/RealizouAction.java
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouAction.java
diff --git a/trunk/siprp/medicina/presencas/actions/RealizouParcialmenteAction.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouParcialmenteAction.java
similarity index 100%
rename from trunk/siprp/medicina/presencas/actions/RealizouParcialmenteAction.java
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouParcialmenteAction.java
diff --git a/trunk/siprp/medicina/presencas/auxiliares.xml b/trunk/SIPRPSoft/src/siprp/medicina/presencas/auxiliares.xml
similarity index 100%
rename from trunk/siprp/medicina/presencas/auxiliares.xml
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/auxiliares.xml
diff --git a/trunk/siprp/medicina/presencas/auxiliares.xsl b/trunk/SIPRPSoft/src/siprp/medicina/presencas/auxiliares.xsl
similarity index 100%
rename from trunk/siprp/medicina/presencas/auxiliares.xsl
rename to trunk/SIPRPSoft/src/siprp/medicina/presencas/auxiliares.xsl
diff --git a/trunk/siprp/medicina/prestadores/PrestadoresDataProvider.java b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/PrestadoresDataProvider.java
similarity index 100%
rename from trunk/siprp/medicina/prestadores/PrestadoresDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/medicina/prestadores/PrestadoresDataProvider.java
diff --git a/trunk/siprp/medicina/prestadores/PrestadoresWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/PrestadoresWindow.java
similarity index 100%
rename from trunk/siprp/medicina/prestadores/PrestadoresWindow.java
rename to trunk/SIPRPSoft/src/siprp/medicina/prestadores/PrestadoresWindow.java
diff --git a/trunk/siprp/medicina/prestadores/data/Prestadores.java b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/Prestadores.java
similarity index 100%
rename from trunk/siprp/medicina/prestadores/data/Prestadores.java
rename to trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/Prestadores.java
diff --git a/trunk/siprp/medicina/prestadores/data/PrestadoresData.java b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresData.java
similarity index 100%
rename from trunk/siprp/medicina/prestadores/data/PrestadoresData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresData.java
diff --git a/trunk/siprp/medicina/prestadores/data/PrestadoresID.java b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresID.java
similarity index 100%
rename from trunk/siprp/medicina/prestadores/data/PrestadoresID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresID.java
diff --git a/trunk/siprp/medicina/prestadores/data/package.jdo b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/package.jdo
similarity index 100%
rename from trunk/siprp/medicina/prestadores/data/package.jdo
rename to trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/package.jdo
diff --git a/trunk/siprp/medicina/processo/EscolherMotivoDialog.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/EscolherMotivoDialog.java
similarity index 100%
rename from trunk/siprp/medicina/processo/EscolherMotivoDialog.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/EscolherMotivoDialog.java
diff --git a/trunk/siprp/medicina/processo/ProcessoConstants.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoConstants.java
similarity index 100%
rename from trunk/siprp/medicina/processo/ProcessoConstants.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoConstants.java
diff --git a/trunk/siprp/medicina/processo/ProcessoController.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoController.java
similarity index 100%
rename from trunk/siprp/medicina/processo/ProcessoController.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoController.java
diff --git a/trunk/siprp/medicina/processo/ProcessoDataProvider.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoDataProvider.java
similarity index 100%
rename from trunk/siprp/medicina/processo/ProcessoDataProvider.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoDataProvider.java
diff --git a/trunk/siprp/medicina/processo/ProcessoEvent.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoEvent.java
similarity index 100%
rename from trunk/siprp/medicina/processo/ProcessoEvent.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoEvent.java
diff --git a/trunk/siprp/medicina/processo/ProcessoListener.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoListener.java
similarity index 100%
rename from trunk/siprp/medicina/processo/ProcessoListener.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoListener.java
diff --git a/trunk/siprp/medicina/processo/ProcessoPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoPanel.java
similarity index 100%
rename from trunk/siprp/medicina/processo/ProcessoPanel.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoPanel.java
diff --git a/trunk/siprp/medicina/processo/ProcessoUpperPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoUpperPanel.java
similarity index 100%
rename from trunk/siprp/medicina/processo/ProcessoUpperPanel.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoUpperPanel.java
diff --git a/trunk/siprp/medicina/processo/ProcessoWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoWindow.java
similarity index 100%
rename from trunk/siprp/medicina/processo/ProcessoWindow.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/ProcessoWindow.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultas.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultas.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultas.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultas.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultasData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasData.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultasData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasData.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatas.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatas.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatas.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatas.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasData.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasData.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmails.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmails.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmails.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmails.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsData.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsData.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsID.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsID.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasID.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasID.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoes.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoes.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoes.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoes.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesData.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesData.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesID.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesID.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresConsultasID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasID.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresConsultasID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasID.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcd.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcd.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcd.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcd.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdData.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdData.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdID.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdID.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcds.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcds.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcds.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcds.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdsData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsData.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdsData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsData.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatas.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatas.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatas.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatas.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasData.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasData.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmails.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmails.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmails.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmails.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsData.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsData.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsID.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsID.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasID.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasID.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoes.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoes.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoes.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoes.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesData.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesData.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesID.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesID.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresEcdsID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsID.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresEcdsID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsID.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresFichasAptidao.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidao.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresFichasAptidao.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidao.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoData.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoData.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoID.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoID.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresProcesso.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcesso.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresProcesso.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcesso.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresProcessoData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoData.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresProcessoData.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoData.java
diff --git a/trunk/siprp/medicina/processo/data/TrabalhadoresProcessoID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoID.java
similarity index 100%
rename from trunk/siprp/medicina/processo/data/TrabalhadoresProcessoID.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoID.java
diff --git a/trunk/siprp/medicina/processo/data/package.jdo b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/package.jdo
similarity index 100%
rename from trunk/siprp/medicina/processo/data/package.jdo
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/data/package.jdo
diff --git a/trunk/siprp/medicina/processo/detalhes/ConsultaPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/detalhes/ConsultaPanel.java
similarity index 100%
rename from trunk/siprp/medicina/processo/detalhes/ConsultaPanel.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/detalhes/ConsultaPanel.java
diff --git a/trunk/siprp/medicina/processo/detalhes/DetalhesProcessoPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/detalhes/DetalhesProcessoPanel.java
similarity index 100%
rename from trunk/siprp/medicina/processo/detalhes/DetalhesProcessoPanel.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/detalhes/DetalhesProcessoPanel.java
diff --git a/trunk/siprp/medicina/processo/detalhes/ECDsPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/detalhes/ECDsPanel.java
similarity index 100%
rename from trunk/siprp/medicina/processo/detalhes/ECDsPanel.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/detalhes/ECDsPanel.java
diff --git a/trunk/siprp/medicina/processo/detalhes/EstadoChooser.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/detalhes/EstadoChooser.java
similarity index 100%
rename from trunk/siprp/medicina/processo/detalhes/EstadoChooser.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/detalhes/EstadoChooser.java
diff --git a/trunk/siprp/medicina/processo/detalhes/ObservacoesDialog.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/detalhes/ObservacoesDialog.java
similarity index 100%
rename from trunk/siprp/medicina/processo/detalhes/ObservacoesDialog.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/detalhes/ObservacoesDialog.java
diff --git a/trunk/siprp/medicina/processo/estrutura/ConsultaMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ConsultaMutableTreeNode.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/ConsultaMutableTreeNode.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ConsultaMutableTreeNode.java
diff --git a/trunk/siprp/medicina/processo/estrutura/DataMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/DataMutableTreeNode.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/DataMutableTreeNode.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/DataMutableTreeNode.java
diff --git a/trunk/siprp/medicina/processo/estrutura/ECDsMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ECDsMutableTreeNode.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/ECDsMutableTreeNode.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ECDsMutableTreeNode.java
diff --git a/trunk/siprp/medicina/processo/estrutura/EstruturaProcessoMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoMutableTreeNode.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/EstruturaProcessoMutableTreeNode.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoMutableTreeNode.java
diff --git a/trunk/siprp/medicina/processo/estrutura/EstruturaProcessoPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoPanel.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/EstruturaProcessoPanel.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoPanel.java
diff --git a/trunk/siprp/medicina/processo/estrutura/EstruturaProcessoRenderer.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoRenderer.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/EstruturaProcessoRenderer.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoRenderer.java
diff --git a/trunk/siprp/medicina/processo/estrutura/FichaAptidaoMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/FichaAptidaoMutableTreeNode.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/FichaAptidaoMutableTreeNode.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/FichaAptidaoMutableTreeNode.java
diff --git a/trunk/siprp/medicina/processo/estrutura/MailMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/MailMutableTreeNode.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/MailMutableTreeNode.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/MailMutableTreeNode.java
diff --git a/trunk/siprp/medicina/processo/estrutura/MarcacaoMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/MarcacaoMutableTreeNode.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/MarcacaoMutableTreeNode.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/MarcacaoMutableTreeNode.java
diff --git a/trunk/siprp/medicina/processo/estrutura/ObservacoesMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ObservacoesMutableTreeNode.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/ObservacoesMutableTreeNode.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ObservacoesMutableTreeNode.java
diff --git a/trunk/siprp/medicina/processo/estrutura/ProcessoMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ProcessoMutableTreeNode.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/ProcessoMutableTreeNode.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ProcessoMutableTreeNode.java
diff --git a/trunk/siprp/medicina/processo/estrutura/TrabalhadorMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/TrabalhadorMutableTreeNode.java
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/TrabalhadorMutableTreeNode.java
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/TrabalhadorMutableTreeNode.java
diff --git a/trunk/siprp/medicina/processo/estrutura/icons/consulta.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/consulta.png
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/icons/consulta.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/consulta.png
diff --git a/trunk/siprp/medicina/processo/estrutura/icons/data.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/data.png
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/icons/data.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/data.png
diff --git a/trunk/siprp/medicina/processo/estrutura/icons/ecds.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/ecds.png
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/icons/ecds.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/ecds.png
diff --git a/trunk/siprp/medicina/processo/estrutura/icons/fichaaptidao.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/fichaaptidao.png
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/icons/fichaaptidao.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/fichaaptidao.png
diff --git a/trunk/siprp/medicina/processo/estrutura/icons/mail.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/mail.png
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/icons/mail.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/mail.png
diff --git a/trunk/siprp/medicina/processo/estrutura/icons/observacoes.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/observacoes.png
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/icons/observacoes.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/observacoes.png
diff --git a/trunk/siprp/medicina/processo/estrutura/icons/processo.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/processo.png
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/icons/processo.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/processo.png
diff --git a/trunk/siprp/medicina/processo/estrutura/icons/trabalhador.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/trabalhador.png
similarity index 100%
rename from trunk/siprp/medicina/processo/estrutura/icons/trabalhador.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/icons/trabalhador.png
diff --git a/trunk/siprp/medicina/processo/icons/consulta.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/icons/consulta.png
similarity index 100%
rename from trunk/siprp/medicina/processo/icons/consulta.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/icons/consulta.png
diff --git a/trunk/siprp/medicina/processo/icons/ecds.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/icons/ecds.png
similarity index 100%
rename from trunk/siprp/medicina/processo/icons/ecds.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/icons/ecds.png
diff --git a/trunk/siprp/medicina/processo/icons/fichaaptidao.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/icons/fichaaptidao.png
similarity index 100%
rename from trunk/siprp/medicina/processo/icons/fichaaptidao.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/icons/fichaaptidao.png
diff --git a/trunk/siprp/medicina/processo/icons/lock.png b/trunk/SIPRPSoft/src/siprp/medicina/processo/icons/lock.png
similarity index 100%
rename from trunk/siprp/medicina/processo/icons/lock.png
rename to trunk/SIPRPSoft/src/siprp/medicina/processo/icons/lock.png
diff --git a/trunk/siprp/pesquisas/PesquisasProvider.java b/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasProvider.java
similarity index 100%
rename from trunk/siprp/pesquisas/PesquisasProvider.java
rename to trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasProvider.java
diff --git a/trunk/siprp/pesquisas/PesquisasWindow.java b/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java
similarity index 100%
rename from trunk/siprp/pesquisas/PesquisasWindow.java
rename to trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java
diff --git a/trunk/siprp/update/Update.java b/trunk/SIPRPSoft/src/siprp/update/Update.java
similarity index 100%
rename from trunk/siprp/update/Update.java
rename to trunk/SIPRPSoft/src/siprp/update/Update.java
diff --git a/trunk/siprp/update/UpdateList.java b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java
similarity index 100%
rename from trunk/siprp/update/UpdateList.java
rename to trunk/SIPRPSoft/src/siprp/update/UpdateList.java
diff --git a/trunk/siprp/update/UpdateWindow.java b/trunk/SIPRPSoft/src/siprp/update/UpdateWindow.java
similarity index 100%
rename from trunk/siprp/update/UpdateWindow.java
rename to trunk/SIPRPSoft/src/siprp/update/UpdateWindow.java
diff --git a/trunk/siprp/update/updates/V6_1_To_V7_0.java b/trunk/SIPRPSoft/src/siprp/update/updates/V6_1_To_V7_0.java
similarity index 100%
rename from trunk/siprp/update/updates/V6_1_To_V7_0.java
rename to trunk/SIPRPSoft/src/siprp/update/updates/V6_1_To_V7_0.java
diff --git a/trunk/siprp/update/updates/V7_0_To_V7_2.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_0_To_V7_2.java
similarity index 100%
rename from trunk/siprp/update/updates/V7_0_To_V7_2.java
rename to trunk/SIPRPSoft/src/siprp/update/updates/V7_0_To_V7_2.java
diff --git a/trunk/siprp/update/updates/V7_2_To_V7_4.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_2_To_V7_4.java
similarity index 100%
rename from trunk/siprp/update/updates/V7_2_To_V7_4.java
rename to trunk/SIPRPSoft/src/siprp/update/updates/V7_2_To_V7_4.java
diff --git a/trunk/siprp/update/updates/V7_4_To_V7_5.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_4_To_V7_5.java
similarity index 100%
rename from trunk/siprp/update/updates/V7_4_To_V7_5.java
rename to trunk/SIPRPSoft/src/siprp/update/updates/V7_4_To_V7_5.java
diff --git a/trunk/siprp/update/updates/V7_5_To_V7_6.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_5_To_V7_6.java
similarity index 100%
rename from trunk/siprp/update/updates/V7_5_To_V7_6.java
rename to trunk/SIPRPSoft/src/siprp/update/updates/V7_5_To_V7_6.java
diff --git a/trunk/siprp/update/updates/V7_6_To_V7_7.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_6_To_V7_7.java
similarity index 100%
rename from trunk/siprp/update/updates/V7_6_To_V7_7.java
rename to trunk/SIPRPSoft/src/siprp/update/updates/V7_6_To_V7_7.java
diff --git a/trunk/siprp/web/WebUpdater.java b/trunk/SIPRPSoft/src/siprp/web/WebUpdater.java
similarity index 100%
rename from trunk/siprp/web/WebUpdater.java
rename to trunk/SIPRPSoft/src/siprp/web/WebUpdater.java
diff --git a/trunk/siprp_create.sql b/trunk/SIPRPSoft/src/siprp_create.sql
similarity index 100%
rename from trunk/siprp_create.sql
rename to trunk/SIPRPSoft/src/siprp_create.sql
diff --git a/trunk/speedo.properties b/trunk/SIPRPSoft/src/speedo.properties
similarity index 100%
rename from trunk/speedo.properties
rename to trunk/SIPRPSoft/src/speedo.properties
diff --git a/trunk/updtprop.txt b/trunk/SIPRPSoft/src/updtprop.txt
similarity index 100%
rename from trunk/updtprop.txt
rename to trunk/SIPRPSoft/src/updtprop.txt