diff --git a/aeroodocs-service/Dockerfile b/aeroodocs-service/Dockerfile
new file mode 100644
index 0000000..41fe67e
--- /dev/null
+++ b/aeroodocs-service/Dockerfile
@@ -0,0 +1,19 @@
+FROM ubuntu:14.04
+
+ENV REFRESHED_AT 2015-05-02
+
+RUN DEBIAN_FRONTEND=noninteractive && \
+    apt-get update && \
+    apt-get install -y git python3-uno python3-pip xvfb
+
+# Limpieza
+RUN apt-get clean
+
+RUN pip3 install jsonrpc2
+RUN pip3 install daemonize
+
+RUN git clone https://github.com/aeroo/aeroo_docs.git /opt/aeroo_docs
+
+EXPOSE 8989
+
+CMD python3 /opt/aeroo_docs/aeroo-docs start -w adhoc-aeroo-docs-libreoffice -s 8100 -n -p 8989 -i 0.0.0.0
diff --git a/Dockerfile b/openoffice-service/Dockerfile
similarity index 52%
rename from Dockerfile
rename to openoffice-service/Dockerfile
index 8b5a37c..0c5cd76 100644
--- a/Dockerfile
+++ b/openoffice-service/Dockerfile
@@ -1,11 +1,10 @@
 FROM ubuntu:14.04
-MAINTAINER Juan Jose Scarafia <jjs@adhoc.com.ar>
 
 ENV REFRESHED_AT 2015-05-02
 
 RUN DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
-    apt-get install -y git python3-uno libreoffice-writer libreoffice-calc python3-pip xvfb supervisor openjdk-7-jre
+    apt-get install -y git libreoffice-writer libreoffice-calc xvfb openjdk-7-jre
 
 # Accept EULA for MS fonts
 RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections # Accept EULA for MS fonts
@@ -13,21 +12,12 @@ RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula selec
 # agregamos fuentes solicitadas por ivan
 RUN apt-get install -y msttcorefonts curl fonts-cantarell ttf-mscorefonts-installer
 RUN curl -s https://raw.githubusercontent.com/hotice/webupd8/master/install-google-fonts | bash
-# este por ahora no es necesario y ademas pesa muchísimo
-#RUN apt-get install -y ubuntustudio-font-meta
+
 COPY ./resources/segoeui/ /usr/share/fonts/truetype/segoeui/
 
 # Limpieza
 RUN apt-get clean
 
-RUN pip3 install jsonrpc2
-RUN pip3 install daemonize
-
-RUN git clone https://github.com/aeroo/aeroo_docs.git /opt/aeroo_docs
-
-
-
-EXPOSE 8989
+EXPOSE 8100
 
-ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-CMD supervisord -c /etc/supervisor/conf.d/supervisord.conf
\ No newline at end of file
+CMD /usr/bin/soffice --norestore --nologo --norestore --nofirststartwizard --accept="socket,host=0,port=8100;urp;"
diff --git a/resources/segoeui/segoeui.ttf b/openoffice-service/resources/segoeui/segoeui.ttf
similarity index 100%
rename from resources/segoeui/segoeui.ttf
rename to openoffice-service/resources/segoeui/segoeui.ttf
diff --git a/resources/segoeui/segoeuib.ttf b/openoffice-service/resources/segoeui/segoeuib.ttf
similarity index 100%
rename from resources/segoeui/segoeuib.ttf
rename to openoffice-service/resources/segoeui/segoeuib.ttf
diff --git a/resources/segoeui/segoeuii.ttf b/openoffice-service/resources/segoeui/segoeuii.ttf
similarity index 100%
rename from resources/segoeui/segoeuii.ttf
rename to openoffice-service/resources/segoeui/segoeuii.ttf
diff --git a/resources/segoeui/segoeuil.ttf b/openoffice-service/resources/segoeui/segoeuil.ttf
similarity index 100%
rename from resources/segoeui/segoeuil.ttf
rename to openoffice-service/resources/segoeui/segoeuil.ttf
diff --git a/resources/segoeui/segoeuisl.ttf b/openoffice-service/resources/segoeui/segoeuisl.ttf
similarity index 100%
rename from resources/segoeui/segoeuisl.ttf
rename to openoffice-service/resources/segoeui/segoeuisl.ttf
diff --git a/resources/segoeui/segoeuiz.ttf b/openoffice-service/resources/segoeui/segoeuiz.ttf
similarity index 100%
rename from resources/segoeui/segoeuiz.ttf
rename to openoffice-service/resources/segoeui/segoeuiz.ttf
diff --git a/resources/segoeui/seguibl.ttf b/openoffice-service/resources/segoeui/seguibl.ttf
similarity index 100%
rename from resources/segoeui/seguibl.ttf
rename to openoffice-service/resources/segoeui/seguibl.ttf
diff --git a/resources/segoeui/seguibli.ttf b/openoffice-service/resources/segoeui/seguibli.ttf
similarity index 100%
rename from resources/segoeui/seguibli.ttf
rename to openoffice-service/resources/segoeui/seguibli.ttf
diff --git a/resources/segoeui/seguili.ttf b/openoffice-service/resources/segoeui/seguili.ttf
similarity index 100%
rename from resources/segoeui/seguili.ttf
rename to openoffice-service/resources/segoeui/seguili.ttf
diff --git a/resources/segoeui/seguisb.ttf b/openoffice-service/resources/segoeui/seguisb.ttf
similarity index 100%
rename from resources/segoeui/seguisb.ttf
rename to openoffice-service/resources/segoeui/seguisb.ttf
diff --git a/resources/segoeui/seguisbi.ttf b/openoffice-service/resources/segoeui/seguisbi.ttf
similarity index 100%
rename from resources/segoeui/seguisbi.ttf
rename to openoffice-service/resources/segoeui/seguisbi.ttf
diff --git a/resources/segoeui/seguisli.ttf b/openoffice-service/resources/segoeui/seguisli.ttf
similarity index 100%
rename from resources/segoeui/seguisli.ttf
rename to openoffice-service/resources/segoeui/seguisli.ttf
diff --git a/report.odt b/report.odt
new file mode 100644
index 0000000..459acdc
Binary files /dev/null and b/report.odt differ
diff --git a/supervisord.conf b/supervisord.conf
deleted file mode 100644
index 18daf6a..0000000
--- a/supervisord.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:soffice]
-command=/usr/bin/soffice --invisible --headless "--accept=socket,host=localhost,port=8100;urp;"
-
-[program:aeroo_docs]
-command=/opt/aeroo_docs/aeroo-docs start -w localhost -s 8100 -n -p 8989 -i 0.0.0.0