diff --git a/trunk/.classpath b/trunk/.classpath
index 32c17342..884a915d 100644
--- a/trunk/.classpath
+++ b/trunk/.classpath
@@ -3,5 +3,7 @@
 	<classpathentry kind="src" path="web/src"/>
 	<classpathentry kind="src" path="SIPRPSoft/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/evolute"/>
+	<classpathentry kind="lib" path="/evolute/lib/jdo.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/trunk/META-INF/context.xml b/trunk/web/src/META-INF/context.xml
similarity index 100%
rename from trunk/META-INF/context.xml
rename to trunk/web/src/META-INF/context.xml
diff --git a/trunk/WEB-INF/classes/siprp/pagina/GlobalConstants.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/GlobalConstants.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/GlobalConstants.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/GlobalConstants.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/MailerServlet.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/MailerServlet.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/MailerServlet.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/MailerServlet.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/NewsServlet.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/NewsServlet.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/NewsServlet.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/NewsServlet.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/RecruitServlet.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/RecruitServlet.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/RecruitServlet.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/RecruitServlet.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/RelatorioServlet.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/RelatorioServlet.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/RelatorioServlet.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/RelatorioServlet.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/RequestServlet.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/RequestServlet.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/RequestServlet.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/RequestServlet.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/ScheduleServlet.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/ScheduleServlet.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/doGetListaEmpresas.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/doGetListaEmpresas.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/doGetListaEmpresas.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/doGetListaEmpresas.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/doGetListaEstabelecimentos.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/doGetListaEstabelecimentos.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/doGetListaEstabelecimentos.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/doGetListaEstabelecimentos.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadores.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadores.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadores.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadores.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresPendentes.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresPendentes.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresPendentes.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresPendentes.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresTudo.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresTudo.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresTudo.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresTudo.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/doGetTrabalhador.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/doGetTrabalhador.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/doGetTrabalhador.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/doGetTrabalhador.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/doPostLogin.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/doPostLogin.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/doPostLogin.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/doPostLogin.java
diff --git a/trunk/WEB-INF/classes/siprp/pagina/siprpServlet.java b/trunk/web/src/WEB-INF/classes/siprp/pagina/siprpServlet.java
similarity index 100%
rename from trunk/WEB-INF/classes/siprp/pagina/siprpServlet.java
rename to trunk/web/src/WEB-INF/classes/siprp/pagina/siprpServlet.java
diff --git a/trunk/WEB-INF/web.xml b/trunk/web/src/WEB-INF/web.xml
similarity index 100%
rename from trunk/WEB-INF/web.xml
rename to trunk/web/src/WEB-INF/web.xml
diff --git a/trunk/html/clientes.html b/trunk/web/src/html/clientes.html
similarity index 100%
rename from trunk/html/clientes.html
rename to trunk/web/src/html/clientes.html
diff --git a/trunk/html/colaboradores.html b/trunk/web/src/html/colaboradores.html
similarity index 100%
rename from trunk/html/colaboradores.html
rename to trunk/web/src/html/colaboradores.html
diff --git a/trunk/html/contactos.html b/trunk/web/src/html/contactos.html
similarity index 100%
rename from trunk/html/contactos.html
rename to trunk/web/src/html/contactos.html
diff --git a/trunk/html/conteudos/colaboradores_text.html b/trunk/web/src/html/conteudos/colaboradores_text.html
similarity index 100%
rename from trunk/html/conteudos/colaboradores_text.html
rename to trunk/web/src/html/conteudos/colaboradores_text.html
diff --git a/trunk/html/conteudos/contactos_text.html b/trunk/web/src/html/conteudos/contactos_text.html
similarity index 100%
rename from trunk/html/conteudos/contactos_text.html
rename to trunk/web/src/html/conteudos/contactos_text.html
diff --git a/trunk/html/conteudos/higiene_foto_equip_BA.html b/trunk/web/src/html/conteudos/higiene_foto_equip_BA.html
similarity index 100%
rename from trunk/html/conteudos/higiene_foto_equip_BA.html
rename to trunk/web/src/html/conteudos/higiene_foto_equip_BA.html
diff --git a/trunk/html/conteudos/higiene_text.html b/trunk/web/src/html/conteudos/higiene_text.html
similarity index 100%
rename from trunk/html/conteudos/higiene_text.html
rename to trunk/web/src/html/conteudos/higiene_text.html
diff --git a/trunk/html/conteudos/higiene_text_equip.html b/trunk/web/src/html/conteudos/higiene_text_equip.html
similarity index 100%
rename from trunk/html/conteudos/higiene_text_equip.html
rename to trunk/web/src/html/conteudos/higiene_text_equip.html
diff --git a/trunk/html/conteudos/links_text.html b/trunk/web/src/html/conteudos/links_text.html
similarity index 100%
rename from trunk/html/conteudos/links_text.html
rename to trunk/web/src/html/conteudos/links_text.html
diff --git a/trunk/html/conteudos/medicina_text.html b/trunk/web/src/html/conteudos/medicina_text.html
similarity index 100%
rename from trunk/html/conteudos/medicina_text.html
rename to trunk/web/src/html/conteudos/medicina_text.html
diff --git a/trunk/html/conteudos/politica_text.html b/trunk/web/src/html/conteudos/politica_text.html
similarity index 100%
rename from trunk/html/conteudos/politica_text.html
rename to trunk/web/src/html/conteudos/politica_text.html
diff --git a/trunk/html/conteudos/politica_text_20050106.html b/trunk/web/src/html/conteudos/politica_text_20050106.html
similarity index 100%
rename from trunk/html/conteudos/politica_text_20050106.html
rename to trunk/web/src/html/conteudos/politica_text_20050106.html
diff --git a/trunk/html/conteudos/servicos_compl_text.html b/trunk/web/src/html/conteudos/servicos_compl_text.html
similarity index 100%
rename from trunk/html/conteudos/servicos_compl_text.html
rename to trunk/web/src/html/conteudos/servicos_compl_text.html
diff --git a/trunk/html/conteudos/servicos_compl_text_20050106.html b/trunk/web/src/html/conteudos/servicos_compl_text_20050106.html
similarity index 100%
rename from trunk/html/conteudos/servicos_compl_text_20050106.html
rename to trunk/web/src/html/conteudos/servicos_compl_text_20050106.html
diff --git a/trunk/html/conteudos/siprp_text.html b/trunk/web/src/html/conteudos/siprp_text.html
similarity index 100%
rename from trunk/html/conteudos/siprp_text.html
rename to trunk/web/src/html/conteudos/siprp_text.html
diff --git a/trunk/html/conteudos/siprp_text_inovacao.html b/trunk/web/src/html/conteudos/siprp_text_inovacao.html
similarity index 100%
rename from trunk/html/conteudos/siprp_text_inovacao.html
rename to trunk/web/src/html/conteudos/siprp_text_inovacao.html
diff --git a/trunk/html/css/funcs.js b/trunk/web/src/html/css/funcs.js
similarity index 100%
rename from trunk/html/css/funcs.js
rename to trunk/web/src/html/css/funcs.js
diff --git a/trunk/html/css/style.css b/trunk/web/src/html/css/style.css
similarity index 100%
rename from trunk/html/css/style.css
rename to trunk/web/src/html/css/style.css
diff --git a/trunk/html/erro.html b/trunk/web/src/html/erro.html
similarity index 100%
rename from trunk/html/erro.html
rename to trunk/web/src/html/erro.html
diff --git a/trunk/html/frame_erro.html b/trunk/web/src/html/frame_erro.html
similarity index 100%
rename from trunk/html/frame_erro.html
rename to trunk/web/src/html/frame_erro.html
diff --git a/trunk/html/higiene.html b/trunk/web/src/html/higiene.html
similarity index 100%
rename from trunk/html/higiene.html
rename to trunk/web/src/html/higiene.html
diff --git a/trunk/html/index.html b/trunk/web/src/html/index.html
similarity index 100%
rename from trunk/html/index.html
rename to trunk/web/src/html/index.html
diff --git a/trunk/html/links.html b/trunk/web/src/html/links.html
similarity index 100%
rename from trunk/html/links.html
rename to trunk/web/src/html/links.html
diff --git a/trunk/html/mail/cv_enviado.html b/trunk/web/src/html/mail/cv_enviado.html
similarity index 100%
rename from trunk/html/mail/cv_enviado.html
rename to trunk/web/src/html/mail/cv_enviado.html
diff --git a/trunk/html/mail/cv_nao_enviado.html b/trunk/web/src/html/mail/cv_nao_enviado.html
similarity index 100%
rename from trunk/html/mail/cv_nao_enviado.html
rename to trunk/web/src/html/mail/cv_nao_enviado.html
diff --git a/trunk/html/mail/envio_cv.txt b/trunk/web/src/html/mail/envio_cv.txt
similarity index 100%
rename from trunk/html/mail/envio_cv.txt
rename to trunk/web/src/html/mail/envio_cv.txt
diff --git a/trunk/html/mail/pedido_enviado.html b/trunk/web/src/html/mail/pedido_enviado.html
similarity index 100%
rename from trunk/html/mail/pedido_enviado.html
rename to trunk/web/src/html/mail/pedido_enviado.html
diff --git a/trunk/html/mail/pedido_informacao.txt b/trunk/web/src/html/mail/pedido_informacao.txt
similarity index 100%
rename from trunk/html/mail/pedido_informacao.txt
rename to trunk/web/src/html/mail/pedido_informacao.txt
diff --git a/trunk/html/mail/pedido_nao_enviado.html b/trunk/web/src/html/mail/pedido_nao_enviado.html
similarity index 100%
rename from trunk/html/mail/pedido_nao_enviado.html
rename to trunk/web/src/html/mail/pedido_nao_enviado.html
diff --git a/trunk/html/marcacao/CalendarPopup.js b/trunk/web/src/html/marcacao/CalendarPopup.js
similarity index 100%
rename from trunk/html/marcacao/CalendarPopup.js
rename to trunk/web/src/html/marcacao/CalendarPopup.js
diff --git a/trunk/html/marcacao/marcacao.html b/trunk/web/src/html/marcacao/marcacao.html
similarity index 100%
rename from trunk/html/marcacao/marcacao.html
rename to trunk/web/src/html/marcacao/marcacao.html
diff --git a/trunk/html/marcacao/marcacao_consulta.html b/trunk/web/src/html/marcacao/marcacao_consulta.html
similarity index 100%
rename from trunk/html/marcacao/marcacao_consulta.html
rename to trunk/web/src/html/marcacao/marcacao_consulta.html
diff --git a/trunk/html/marcacao/marcacao_enviada.html b/trunk/web/src/html/marcacao/marcacao_enviada.html
similarity index 100%
rename from trunk/html/marcacao/marcacao_enviada.html
rename to trunk/web/src/html/marcacao/marcacao_enviada.html
diff --git a/trunk/html/marcacao/marcacao_exame.html b/trunk/web/src/html/marcacao/marcacao_exame.html
similarity index 100%
rename from trunk/html/marcacao/marcacao_exame.html
rename to trunk/web/src/html/marcacao/marcacao_exame.html
diff --git a/trunk/html/marcacao/marcacao_menu.html b/trunk/web/src/html/marcacao/marcacao_menu.html
similarity index 100%
rename from trunk/html/marcacao/marcacao_menu.html
rename to trunk/web/src/html/marcacao/marcacao_menu.html
diff --git a/trunk/html/marcacao/marcacao_nao_enviada.html b/trunk/web/src/html/marcacao/marcacao_nao_enviada.html
similarity index 100%
rename from trunk/html/marcacao/marcacao_nao_enviada.html
rename to trunk/web/src/html/marcacao/marcacao_nao_enviada.html
diff --git a/trunk/html/marcacao/marcacao_sessao_expirou.html b/trunk/web/src/html/marcacao/marcacao_sessao_expirou.html
similarity index 100%
rename from trunk/html/marcacao/marcacao_sessao_expirou.html
rename to trunk/web/src/html/marcacao/marcacao_sessao_expirou.html
diff --git a/trunk/html/medicina.html b/trunk/web/src/html/medicina.html
similarity index 100%
rename from trunk/html/medicina.html
rename to trunk/web/src/html/medicina.html
diff --git a/trunk/html/noticias/mostrar_noticias.html b/trunk/web/src/html/noticias/mostrar_noticias.html
similarity index 100%
rename from trunk/html/noticias/mostrar_noticias.html
rename to trunk/web/src/html/noticias/mostrar_noticias.html
diff --git a/trunk/html/politica.html b/trunk/web/src/html/politica.html
similarity index 100%
rename from trunk/html/politica.html
rename to trunk/web/src/html/politica.html
diff --git a/trunk/html/relatorio/pedido.html b/trunk/web/src/html/relatorio/pedido.html
similarity index 100%
rename from trunk/html/relatorio/pedido.html
rename to trunk/web/src/html/relatorio/pedido.html
diff --git a/trunk/html/relatorio/pedido_enviado.html b/trunk/web/src/html/relatorio/pedido_enviado.html
similarity index 100%
rename from trunk/html/relatorio/pedido_enviado.html
rename to trunk/web/src/html/relatorio/pedido_enviado.html
diff --git a/trunk/html/relatorio/pedido_nao_enviado.html b/trunk/web/src/html/relatorio/pedido_nao_enviado.html
similarity index 100%
rename from trunk/html/relatorio/pedido_nao_enviado.html
rename to trunk/web/src/html/relatorio/pedido_nao_enviado.html
diff --git a/trunk/html/relatorio/pedido_relatorio.html b/trunk/web/src/html/relatorio/pedido_relatorio.html
similarity index 100%
rename from trunk/html/relatorio/pedido_relatorio.html
rename to trunk/web/src/html/relatorio/pedido_relatorio.html
diff --git a/trunk/html/relatorio/pedido_sessao_expirou.html b/trunk/web/src/html/relatorio/pedido_sessao_expirou.html
similarity index 100%
rename from trunk/html/relatorio/pedido_sessao_expirou.html
rename to trunk/web/src/html/relatorio/pedido_sessao_expirou.html
diff --git a/trunk/html/servicos.html b/trunk/web/src/html/servicos.html
similarity index 100%
rename from trunk/html/servicos.html
rename to trunk/web/src/html/servicos.html
diff --git a/trunk/html/servicos_compl.html b/trunk/web/src/html/servicos_compl.html
similarity index 100%
rename from trunk/html/servicos_compl.html
rename to trunk/web/src/html/servicos_compl.html
diff --git a/trunk/html/siprp.html b/trunk/web/src/html/siprp.html
similarity index 100%
rename from trunk/html/siprp.html
rename to trunk/web/src/html/siprp.html
diff --git a/trunk/html/user.html b/trunk/web/src/html/user.html
similarity index 100%
rename from trunk/html/user.html
rename to trunk/web/src/html/user.html
diff --git a/trunk/html/user_print.html b/trunk/web/src/html/user_print.html
similarity index 100%
rename from trunk/html/user_print.html
rename to trunk/web/src/html/user_print.html