diff --git a/bumper/confserver.py b/bumper/confserver.py
index d506e78..8b9cec2 100644
--- a/bumper/confserver.py
+++ b/bumper/confserver.py
@@ -58,7 +58,7 @@ class ConfServer:
         self.app = web.Application(loop=asyncio.get_event_loop(), middlewares=[
             self.log_all_requests,
             ])
-        aiohttp_jinja2.setup(self.app, loader=jinja2.FileSystemLoader(os.path.join(bumper.data_dir, "web","templates")))          
+        aiohttp_jinja2.setup(self.app, loader=jinja2.FileSystemLoader(os.path.join(bumper.bumper_dir,"bumper","web","templates")))
 
         self.app.add_routes(
             [
diff --git a/bumper/plugins/bumper_confserver_portal_pim.py b/bumper/plugins/bumper_confserver_portal_pim.py
index 1727486..286165f 100644
--- a/bumper/plugins/bumper_confserver_portal_pim.py
+++ b/bumper/plugins/bumper_confserver_portal_pim.py
@@ -43,7 +43,7 @@ class portal_api_pim(plugins.ConfServerApp):
         try:
             fileID = request.match_info.get("id", "")
 
-            return web.FileResponse(os.path.join(bumper.data_dir,"web","robotvac_image.jpg"))
+            return web.FileResponse(os.path.join(bumper.bumper_dir,"bumper","web","images","robotvac_image.jpg"))
             
         except Exception as e:
             logging.exception("{}".format(e))          
diff --git a/bumper/plugins/bumper_confserver_upload_global.py b/bumper/plugins/bumper_confserver_upload_global.py
index 8993a7c..f823ec5 100644
--- a/bumper/plugins/bumper_confserver_upload_global.py
+++ b/bumper/plugins/bumper_confserver_upload_global.py
@@ -30,7 +30,7 @@ class upload_global(plugins.ConfServerApp):
         try:
             fileID = request.match_info.get("id", "")
 
-            return web.FileResponse(os.path.join(bumper.data_dir,"web","robotvac_image.jpg"))
+            return web.FileResponse(os.path.join(bumper.bumper_dir,"bumper","web","images","robotvac_image.jpg"))
             
         except Exception as e:
             logging.exception("{}".format(e))          
diff --git a/data/web/robotvac_image.jpg b/bumper/web/images/robotvac_image.jpg
similarity index 100%
rename from data/web/robotvac_image.jpg
rename to bumper/web/images/robotvac_image.jpg
diff --git a/data/web/templates/home.jinja2 b/bumper/web/templates/home.jinja2
similarity index 100%
rename from data/web/templates/home.jinja2
rename to bumper/web/templates/home.jinja2