diff --git a/Dockerfile b/Dockerfile
index c5d1741..07e969f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,7 +52,6 @@ EXPOSE ${TFW_PUBLIC_PORT}
 EXPOSE ${TFW_CRP_LISTENER_PORT}
 
 ENV TFW_SUPERVISOR_HTTP_URI="http://localhost:${TFW_SUPERVISOR_HTTP_PORT}"
-ENV TFW_EVENT_HANDLERS_DIR="/opt/event_handlers"
 ENV TFW_APP_DIR="/srv/app"
 ENV TFW_CONTROLLER_DIR="/srv/controller"
 ENV TFW_FRONTEND_DIR="/srv/frontend"
@@ -75,18 +74,19 @@ RUN chown -R ${AVATAO_USER} /var/log/nginx /var/lib/nginx &&\
         envsubst "$(printenv | cut -d= -f1 | grep TFW_ | sed -e 's/^/$/g')" < $f > $f ;\
     done
 
-COPY lib ${TFW_LIB_DIR}
 COPY supervisor/supervisord.conf ${TFW_SUPERVISORD_CONF}
 COPY supervisor/components/ ${TFW_SUPERVISORD_COMPONENTS}
-COPY src/app ${TFW_APP_DIR}
-COPY src/event_handlers ${TFW_EVENT_HANDLERS_DIR}
+COPY lib ${TFW_LIB_DIR}
 COPY src/controller ${TFW_CONTROLLER_DIR}
+COPY lib/tfw/components/terminado_mini_server.py ${TFW_TERMINADO_DIR}/
 
 RUN mv /data/dist ${TFW_FRONTEND_DIR}
 
-COPY src/event_handlers/source_code_server/server.py ${TFW_LOGIN_APP_DIR}/
-COPY src/event_handlers/source_code_server/users.db ${TFW_LOGIN_APP_DIR}/
-COPY src/event_handlers/source_code_server/login_component.py ${TFW_WEBIDE_WD}/
+COPY src/demo ${TFW_APP_DIR}/
+
+COPY src/demo/source_code_server/server.py ${TFW_LOGIN_APP_DIR}/
+COPY src/demo/source_code_server/users.db ${TFW_LOGIN_APP_DIR}/
+COPY src/demo/source_code_server/login_component.py ${TFW_WEBIDE_WD}/
 
 RUN chown -R ${AVATAO_USER} ${TFW_WEBIDE_WD} && chmod -R 755 ${TFW_WEBIDE_WD}
 
diff --git a/src/event_handlers/source_code_event_handler.py b/lib/tfw/components/source_code_event_handler.py
similarity index 100%
rename from src/event_handlers/source_code_event_handler.py
rename to lib/tfw/components/source_code_event_handler.py
diff --git a/src/event_handlers/terminado_event_handler.py b/lib/tfw/components/terminado_event_handler.py
similarity index 72%
rename from src/event_handlers/terminado_event_handler.py
rename to lib/tfw/components/terminado_event_handler.py
index 9852247..4222e05 100644
--- a/src/event_handlers/terminado_event_handler.py
+++ b/lib/tfw/components/terminado_event_handler.py
@@ -1,5 +1,3 @@
-from shutil import rmtree, copytree
-
 from tfw.event_handler_base import EventHandlerBase
 from tfw.util import SupervisorMixin
 from tfw.config import tfwenv
@@ -12,11 +10,6 @@ class TerminadoEventHandler(EventHandlerBase, SupervisorMixin):
         super().__init__(anchor)
         self.working_directory = tfwenv.TERMINADO_DIR
         self.process_name = process_name
-        self.setup_terminado_server()
-
-    def setup_terminado_server(self):
-        rmtree(self.working_directory, ignore_errors=True)
-        copytree('terminado_server/', self.working_directory)
         self.start_process()
 
     def handle_event(self, anchor, data_json):
diff --git a/src/event_handlers/terminado_server/server.py b/lib/tfw/components/terminado_mini_server.py
similarity index 100%
rename from src/event_handlers/terminado_server/server.py
rename to lib/tfw/components/terminado_mini_server.py
diff --git a/src/app/app.py b/src/demo/app.py
similarity index 100%
rename from src/app/app.py
rename to src/demo/app.py
diff --git a/src/event_handlers/event_handler_main.py b/src/demo/event_handler_main.py
similarity index 65%
rename from src/event_handlers/event_handler_main.py
rename to src/demo/event_handler_main.py
index b349b6b..f7623a9 100644
--- a/src/event_handlers/event_handler_main.py
+++ b/src/demo/event_handler_main.py
@@ -1,5 +1,5 @@
-from source_code_event_handler import SourceCodeEventHandler
-from terminado_event_handler import TerminadoEventHandler
+from tfw.components.source_code_event_handler import SourceCodeEventHandler
+from tfw.components.terminado_event_handler import TerminadoEventHandler
 from tornado.ioloop import IOLoop
 
 from tfw.config import tfwenv
diff --git a/src/event_handlers/source_code_server/login_component.py b/src/demo/source_code_server/login_component.py
similarity index 100%
rename from src/event_handlers/source_code_server/login_component.py
rename to src/demo/source_code_server/login_component.py
diff --git a/src/event_handlers/source_code_server/server.py b/src/demo/source_code_server/server.py
similarity index 100%
rename from src/event_handlers/source_code_server/server.py
rename to src/demo/source_code_server/server.py
diff --git a/src/event_handlers/source_code_server/users.db b/src/demo/source_code_server/users.db
similarity index 100%
rename from src/event_handlers/source_code_server/users.db
rename to src/demo/source_code_server/users.db
diff --git a/src/app/sql_injection_fsm.py b/src/demo/sql_injection_fsm.py
similarity index 100%
rename from src/app/sql_injection_fsm.py
rename to src/demo/sql_injection_fsm.py
diff --git a/supervisor/components/event_handlers.conf b/supervisor/components/event_handlers.conf
index 887c1c6..a28afe5 100644
--- a/supervisor/components/event_handlers.conf
+++ b/supervisor/components/event_handlers.conf
@@ -1,3 +1,3 @@
 [program:event_handler_main]
-directory=%(ENV_TFW_EVENT_HANDLERS_DIR)s
+directory=%(ENV_TFW_APP_DIR)s
 command=env python event_handler_main.py
diff --git a/supervisor/components/terminado.conf b/supervisor/components/terminado.conf
index ccf7595..30c441d 100644
--- a/supervisor/components/terminado.conf
+++ b/supervisor/components/terminado.conf
@@ -1,4 +1,4 @@
 [program:terminado]
 directory=%(ENV_TFW_TERMINADO_DIR)s
-command=env python server.py
+command=env python terminado_mini_server.py
 autostart=false