diff --git a/Pipfile b/Pipfile
index 2b1258fdbf67f955c9b78728e6d66a235d54772e..47e077d1284cfe1679de0ddb10b5b57bf987c70a 100644
--- a/Pipfile
+++ b/Pipfile
@@ -17,5 +17,6 @@ gevent = "==20.6.1"
 TheCodeLabs-BaseUtils = "*"
 TheCodeLabs-FlaskUtils = "*"
 python-jenkins = "==1.5.0"
+Pillow = "==7.2.0"
 
 [dev-packages]
diff --git a/src/logic/Image.py b/src/logic/display/Image.py
similarity index 99%
rename from src/logic/Image.py
rename to src/logic/display/Image.py
index 495f3bc0b4ddcdc81c0914a1e8f17809cae03d21..ee082a783aaaa37199d1772d6b3d62627ebe275e 100644
--- a/src/logic/Image.py
+++ b/src/logic/display/Image.py
@@ -2,7 +2,6 @@ from PIL import Image, ImageDraw
 
 
 class AbstractImage:
-
     BLACK = 0
     RED = 1
 
@@ -23,7 +22,6 @@ class AbstractImage:
 
 
 class EPDImage(AbstractImage):
-
     def __init__(self, width, height):
         self.__blackImage = Image.new('1', (width, height), 255)
         self.__redImage = Image.new('1', (width, height), 255)
@@ -57,7 +55,6 @@ class EPDImage(AbstractImage):
 
 
 class DebugImage(AbstractImage):
-
     def __init__(self, width, height):
         self.__image = Image.new('RGB', (width, height), (255, 255, 255))
         self.__draw = ImageDraw.Draw(self.__image)
@@ -85,4 +82,3 @@ class DebugImage(AbstractImage):
 
     def get_red_image(self):
         return self.__image
-
diff --git a/src/logic/Main.py b/src/logic/display/Main.py
similarity index 95%
rename from src/logic/Main.py
rename to src/logic/display/Main.py
index 3b905395c7ca9e2ce6ffd7a1d7031d9afc25b174..2afee08ba43250c9b4ef060d40ff296f59ced8d1 100644
--- a/src/logic/Main.py
+++ b/src/logic/display/Main.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-# -*- coding:utf-8 -*-
 import logging
 import os
 import sys
@@ -7,7 +5,7 @@ import time
 
 from PIL import Image, ImageDraw, ImageFont
 
-from logic.Image import DebugImage, EPDImage, AbstractImage
+from logic.display.Image import DebugImage, EPDImage, AbstractImage
 from libs.lib.waveshare_epd import epd4in2bc
 
 logging.basicConfig(level=logging.DEBUG)
diff --git a/src/logic/display/__init__.py b/src/logic/display/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391