diff --git a/_TRANSLATION.md b/pikaraoke/_TRANSLATION.md
similarity index 100%
rename from _TRANSLATION.md
rename to pikaraoke/_TRANSLATION.md
diff --git a/lib/__init__.py b/pikaraoke/__init__.py
similarity index 100%
rename from lib/__init__.py
rename to pikaraoke/__init__.py
diff --git a/app.py b/pikaraoke/app.py
similarity index 100%
rename from app.py
rename to pikaraoke/app.py
diff --git a/babel.cfg b/pikaraoke/babel.cfg
similarity index 100%
rename from babel.cfg
rename to pikaraoke/babel.cfg
diff --git a/constants.py b/pikaraoke/constants.py
similarity index 100%
rename from constants.py
rename to pikaraoke/constants.py
diff --git a/karaoke.py b/pikaraoke/karaoke.py
similarity index 100%
rename from karaoke.py
rename to pikaraoke/karaoke.py
diff --git a/lib/file_resolver.py b/pikaraoke/lib/file_resolver.py
similarity index 100%
rename from lib/file_resolver.py
rename to pikaraoke/lib/file_resolver.py
diff --git a/lib/get_platform.py b/pikaraoke/lib/get_platform.py
similarity index 100%
rename from lib/get_platform.py
rename to pikaraoke/lib/get_platform.py
diff --git a/lib/omxclient.py b/pikaraoke/lib/omxclient.py
similarity index 100%
rename from lib/omxclient.py
rename to pikaraoke/lib/omxclient.py
diff --git a/lib/vlcclient.py b/pikaraoke/lib/vlcclient.py
similarity index 100%
rename from lib/vlcclient.py
rename to pikaraoke/lib/vlcclient.py
diff --git a/logo.png b/pikaraoke/logo.png
similarity index 100%
rename from logo.png
rename to pikaraoke/logo.png
diff --git a/messages.pot b/pikaraoke/messages.pot
similarity index 100%
rename from messages.pot
rename to pikaraoke/messages.pot
diff --git a/pikaraoke.bat b/pikaraoke/pikaraoke.bat
similarity index 100%
rename from pikaraoke.bat
rename to pikaraoke/pikaraoke.bat
diff --git a/pikaraoke.sh b/pikaraoke/pikaraoke.sh
similarity index 100%
rename from pikaraoke.sh
rename to pikaraoke/pikaraoke.sh
diff --git a/scripts/how-to-image.md b/pikaraoke/scripts/how-to-image.md
similarity index 100%
rename from scripts/how-to-image.md
rename to pikaraoke/scripts/how-to-image.md
diff --git a/scripts/prepare_pi_image.sh b/pikaraoke/scripts/prepare_pi_image.sh
similarity index 100%
rename from scripts/prepare_pi_image.sh
rename to pikaraoke/scripts/prepare_pi_image.sh
diff --git a/setup-windows.bat b/pikaraoke/setup-windows.bat
similarity index 100%
rename from setup-windows.bat
rename to pikaraoke/setup-windows.bat
diff --git a/setup.sh b/pikaraoke/setup.sh
similarity index 100%
rename from setup.sh
rename to pikaraoke/setup.sh
diff --git a/static/bulma-dark.css b/pikaraoke/static/bulma-dark.css
similarity index 100%
rename from static/bulma-dark.css
rename to pikaraoke/static/bulma-dark.css
diff --git a/static/bulma.min.css b/pikaraoke/static/bulma.min.css
similarity index 100%
rename from static/bulma.min.css
rename to pikaraoke/static/bulma.min.css
diff --git a/static/custom.css b/pikaraoke/static/custom.css
similarity index 100%
rename from static/custom.css
rename to pikaraoke/static/custom.css
diff --git a/static/fontello-old/LICENSE.txt b/pikaraoke/static/fontello-old/LICENSE.txt
similarity index 100%
rename from static/fontello-old/LICENSE.txt
rename to pikaraoke/static/fontello-old/LICENSE.txt
diff --git a/static/fontello-old/README.txt b/pikaraoke/static/fontello-old/README.txt
similarity index 100%
rename from static/fontello-old/README.txt
rename to pikaraoke/static/fontello-old/README.txt
diff --git a/static/fontello-old/config.json b/pikaraoke/static/fontello-old/config.json
similarity index 100%
rename from static/fontello-old/config.json
rename to pikaraoke/static/fontello-old/config.json
diff --git a/static/fontello-old/css/animation.css b/pikaraoke/static/fontello-old/css/animation.css
similarity index 100%
rename from static/fontello-old/css/animation.css
rename to pikaraoke/static/fontello-old/css/animation.css
diff --git a/static/fontello-old/css/fontello-codes.css b/pikaraoke/static/fontello-old/css/fontello-codes.css
similarity index 100%
rename from static/fontello-old/css/fontello-codes.css
rename to pikaraoke/static/fontello-old/css/fontello-codes.css
diff --git a/static/fontello-old/css/fontello-embedded.css b/pikaraoke/static/fontello-old/css/fontello-embedded.css
similarity index 100%
rename from static/fontello-old/css/fontello-embedded.css
rename to pikaraoke/static/fontello-old/css/fontello-embedded.css
diff --git a/static/fontello-old/css/fontello-ie7-codes.css b/pikaraoke/static/fontello-old/css/fontello-ie7-codes.css
similarity index 100%
rename from static/fontello-old/css/fontello-ie7-codes.css
rename to pikaraoke/static/fontello-old/css/fontello-ie7-codes.css
diff --git a/static/fontello-old/css/fontello-ie7.css b/pikaraoke/static/fontello-old/css/fontello-ie7.css
similarity index 100%
rename from static/fontello-old/css/fontello-ie7.css
rename to pikaraoke/static/fontello-old/css/fontello-ie7.css
diff --git a/static/fontello-old/css/fontello.css b/pikaraoke/static/fontello-old/css/fontello.css
similarity index 100%
rename from static/fontello-old/css/fontello.css
rename to pikaraoke/static/fontello-old/css/fontello.css
diff --git a/static/fontello-old/demo.html b/pikaraoke/static/fontello-old/demo.html
similarity index 100%
rename from static/fontello-old/demo.html
rename to pikaraoke/static/fontello-old/demo.html
diff --git a/static/fontello-old/font/fontello.eot b/pikaraoke/static/fontello-old/font/fontello.eot
similarity index 100%
rename from static/fontello-old/font/fontello.eot
rename to pikaraoke/static/fontello-old/font/fontello.eot
diff --git a/static/fontello-old/font/fontello.svg b/pikaraoke/static/fontello-old/font/fontello.svg
similarity index 100%
rename from static/fontello-old/font/fontello.svg
rename to pikaraoke/static/fontello-old/font/fontello.svg
diff --git a/static/fontello-old/font/fontello.ttf b/pikaraoke/static/fontello-old/font/fontello.ttf
similarity index 100%
rename from static/fontello-old/font/fontello.ttf
rename to pikaraoke/static/fontello-old/font/fontello.ttf
diff --git a/static/fontello-old/font/fontello.woff b/pikaraoke/static/fontello-old/font/fontello.woff
similarity index 100%
rename from static/fontello-old/font/fontello.woff
rename to pikaraoke/static/fontello-old/font/fontello.woff
diff --git a/static/fontello-old/font/fontello.woff2 b/pikaraoke/static/fontello-old/font/fontello.woff2
similarity index 100%
rename from static/fontello-old/font/fontello.woff2
rename to pikaraoke/static/fontello-old/font/fontello.woff2
diff --git a/static/fontello/LICENSE.txt b/pikaraoke/static/fontello/LICENSE.txt
similarity index 100%
rename from static/fontello/LICENSE.txt
rename to pikaraoke/static/fontello/LICENSE.txt
diff --git a/static/fontello/README.txt b/pikaraoke/static/fontello/README.txt
similarity index 100%
rename from static/fontello/README.txt
rename to pikaraoke/static/fontello/README.txt
diff --git a/static/fontello/config.json b/pikaraoke/static/fontello/config.json
similarity index 100%
rename from static/fontello/config.json
rename to pikaraoke/static/fontello/config.json
diff --git a/static/fontello/css/animation.css b/pikaraoke/static/fontello/css/animation.css
similarity index 100%
rename from static/fontello/css/animation.css
rename to pikaraoke/static/fontello/css/animation.css
diff --git a/static/fontello/css/fontello-codes.css b/pikaraoke/static/fontello/css/fontello-codes.css
similarity index 100%
rename from static/fontello/css/fontello-codes.css
rename to pikaraoke/static/fontello/css/fontello-codes.css
diff --git a/static/fontello/css/fontello-embedded.css b/pikaraoke/static/fontello/css/fontello-embedded.css
similarity index 100%
rename from static/fontello/css/fontello-embedded.css
rename to pikaraoke/static/fontello/css/fontello-embedded.css
diff --git a/static/fontello/css/fontello-ie7-codes.css b/pikaraoke/static/fontello/css/fontello-ie7-codes.css
similarity index 100%
rename from static/fontello/css/fontello-ie7-codes.css
rename to pikaraoke/static/fontello/css/fontello-ie7-codes.css
diff --git a/static/fontello/css/fontello-ie7.css b/pikaraoke/static/fontello/css/fontello-ie7.css
similarity index 100%
rename from static/fontello/css/fontello-ie7.css
rename to pikaraoke/static/fontello/css/fontello-ie7.css
diff --git a/static/fontello/css/fontello.css b/pikaraoke/static/fontello/css/fontello.css
similarity index 100%
rename from static/fontello/css/fontello.css
rename to pikaraoke/static/fontello/css/fontello.css
diff --git a/static/fontello/demo.html b/pikaraoke/static/fontello/demo.html
similarity index 100%
rename from static/fontello/demo.html
rename to pikaraoke/static/fontello/demo.html
diff --git a/static/fontello/font/fontello.eot b/pikaraoke/static/fontello/font/fontello.eot
similarity index 100%
rename from static/fontello/font/fontello.eot
rename to pikaraoke/static/fontello/font/fontello.eot
diff --git a/static/fontello/font/fontello.svg b/pikaraoke/static/fontello/font/fontello.svg
similarity index 100%
rename from static/fontello/font/fontello.svg
rename to pikaraoke/static/fontello/font/fontello.svg
diff --git a/static/fontello/font/fontello.ttf b/pikaraoke/static/fontello/font/fontello.ttf
similarity index 100%
rename from static/fontello/font/fontello.ttf
rename to pikaraoke/static/fontello/font/fontello.ttf
diff --git a/static/fontello/font/fontello.woff b/pikaraoke/static/fontello/font/fontello.woff
similarity index 100%
rename from static/fontello/font/fontello.woff
rename to pikaraoke/static/fontello/font/fontello.woff
diff --git a/static/fontello/font/fontello.woff2 b/pikaraoke/static/fontello/font/fontello.woff2
similarity index 100%
rename from static/fontello/font/fontello.woff2
rename to pikaraoke/static/fontello/font/fontello.woff2
diff --git a/static/images/microphone.png b/pikaraoke/static/images/microphone.png
similarity index 100%
rename from static/images/microphone.png
rename to pikaraoke/static/images/microphone.png
diff --git a/static/images/now-playing.gif b/pikaraoke/static/images/now-playing.gif
similarity index 100%
rename from static/images/now-playing.gif
rename to pikaraoke/static/images/now-playing.gif
diff --git a/static/images/now-playing.png b/pikaraoke/static/images/now-playing.png
similarity index 100%
rename from static/images/now-playing.png
rename to pikaraoke/static/images/now-playing.png
diff --git a/static/images/ui-icons_444444_256x240.png b/pikaraoke/static/images/ui-icons_444444_256x240.png
similarity index 100%
rename from static/images/ui-icons_444444_256x240.png
rename to pikaraoke/static/images/ui-icons_444444_256x240.png
diff --git a/static/images/ui-icons_555555_256x240.png b/pikaraoke/static/images/ui-icons_555555_256x240.png
similarity index 100%
rename from static/images/ui-icons_555555_256x240.png
rename to pikaraoke/static/images/ui-icons_555555_256x240.png
diff --git a/static/images/ui-icons_777620_256x240.png b/pikaraoke/static/images/ui-icons_777620_256x240.png
similarity index 100%
rename from static/images/ui-icons_777620_256x240.png
rename to pikaraoke/static/images/ui-icons_777620_256x240.png
diff --git a/static/images/ui-icons_777777_256x240.png b/pikaraoke/static/images/ui-icons_777777_256x240.png
similarity index 100%
rename from static/images/ui-icons_777777_256x240.png
rename to pikaraoke/static/images/ui-icons_777777_256x240.png
diff --git a/static/images/ui-icons_cc0000_256x240.png b/pikaraoke/static/images/ui-icons_cc0000_256x240.png
similarity index 100%
rename from static/images/ui-icons_cc0000_256x240.png
rename to pikaraoke/static/images/ui-icons_cc0000_256x240.png
diff --git a/static/images/ui-icons_ffffff_256x240.png b/pikaraoke/static/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from static/images/ui-icons_ffffff_256x240.png
rename to pikaraoke/static/images/ui-icons_ffffff_256x240.png
diff --git a/static/jquery-3.3.1.min.js b/pikaraoke/static/jquery-3.3.1.min.js
similarity index 100%
rename from static/jquery-3.3.1.min.js
rename to pikaraoke/static/jquery-3.3.1.min.js
diff --git a/static/js.cookie-2.2.1.min.js b/pikaraoke/static/js.cookie-2.2.1.min.js
similarity index 100%
rename from static/js.cookie-2.2.1.min.js
rename to pikaraoke/static/js.cookie-2.2.1.min.js
diff --git a/static/lodash.min.js b/pikaraoke/static/lodash.min.js
similarity index 100%
rename from static/lodash.min.js
rename to pikaraoke/static/lodash.min.js
diff --git a/static/screensaver.css b/pikaraoke/static/screensaver.css
similarity index 100%
rename from static/screensaver.css
rename to pikaraoke/static/screensaver.css
diff --git a/static/screensaver.js b/pikaraoke/static/screensaver.js
similarity index 100%
rename from static/screensaver.js
rename to pikaraoke/static/screensaver.js
diff --git a/static/selectize.min.css b/pikaraoke/static/selectize.min.css
similarity index 100%
rename from static/selectize.min.css
rename to pikaraoke/static/selectize.min.css
diff --git a/static/selectize.min.js b/pikaraoke/static/selectize.min.js
similarity index 100%
rename from static/selectize.min.js
rename to pikaraoke/static/selectize.min.js
diff --git a/templates/base.html b/pikaraoke/templates/base.html
similarity index 100%
rename from templates/base.html
rename to pikaraoke/templates/base.html
diff --git a/templates/edit.html b/pikaraoke/templates/edit.html
similarity index 100%
rename from templates/edit.html
rename to pikaraoke/templates/edit.html
diff --git a/templates/files.html b/pikaraoke/templates/files.html
similarity index 100%
rename from templates/files.html
rename to pikaraoke/templates/files.html
diff --git a/templates/home.html b/pikaraoke/templates/home.html
similarity index 100%
rename from templates/home.html
rename to pikaraoke/templates/home.html
diff --git a/templates/info.html b/pikaraoke/templates/info.html
similarity index 100%
rename from templates/info.html
rename to pikaraoke/templates/info.html
diff --git a/templates/login.html b/pikaraoke/templates/login.html
similarity index 100%
rename from templates/login.html
rename to pikaraoke/templates/login.html
diff --git a/templates/queue.html b/pikaraoke/templates/queue.html
similarity index 100%
rename from templates/queue.html
rename to pikaraoke/templates/queue.html
diff --git a/templates/search.html b/pikaraoke/templates/search.html
similarity index 100%
rename from templates/search.html
rename to pikaraoke/templates/search.html
diff --git a/templates/splash.html b/pikaraoke/templates/splash.html
similarity index 100%
rename from templates/splash.html
rename to pikaraoke/templates/splash.html
diff --git a/translations/fi_FI/messages.po b/pikaraoke/translations/fi_FI/messages.po
similarity index 100%
rename from translations/fi_FI/messages.po
rename to pikaraoke/translations/fi_FI/messages.po
diff --git a/translations/pt_BR/LC_MESSAGES/messages.mo b/pikaraoke/translations/pt_BR/LC_MESSAGES/messages.mo
similarity index 100%
rename from translations/pt_BR/LC_MESSAGES/messages.mo
rename to pikaraoke/translations/pt_BR/LC_MESSAGES/messages.mo
diff --git a/translations/pt_BR/LC_MESSAGES/messages.po b/pikaraoke/translations/pt_BR/LC_MESSAGES/messages.po
similarity index 100%
rename from translations/pt_BR/LC_MESSAGES/messages.po
rename to pikaraoke/translations/pt_BR/LC_MESSAGES/messages.po
diff --git a/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/pikaraoke/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
similarity index 100%
rename from translations/zh_Hans_CN/LC_MESSAGES/messages.mo
rename to pikaraoke/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
diff --git a/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/pikaraoke/translations/zh_Hans_CN/LC_MESSAGES/messages.po
similarity index 100%
rename from translations/zh_Hans_CN/LC_MESSAGES/messages.po
rename to pikaraoke/translations/zh_Hans_CN/LC_MESSAGES/messages.po