diff --git a/build/ci/Dockerfile b/build/ci/Dockerfile
index 57a0ac0..43bb08b 100644
--- a/build/ci/Dockerfile
+++ b/build/ci/Dockerfile
@@ -13,6 +13,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
 		python3-gi \
 		python3-pyqt5 \
 		python3-ruamel.yaml \
+		python3-pyinotify \
 		python3-xlib \
 		python3-pip
 
diff --git a/build/utils.sh b/build/utils.sh
index a6b9fbd..023093b 100755
--- a/build/utils.sh
+++ b/build/utils.sh
@@ -25,7 +25,7 @@ do_build() {
 	# Compile Resources
 	(combine_javascript_sources \
 		&& pyrcc5 -o "${BUILD_DIR}/${PKGNAME}/resources.py" ../resources.qrc \
-		&& cp "${BUILD_DIR}/${PKGNAME}/resources.py" "${REPO_DIR}/web-greeter")
+		&& cp "${BUILD_DIR}/${PKGNAME}/resources.py" "${REPO_DIR}/src")
 
 	# Create "Zip Application"
 	(cd "${PKGNAME}" \
@@ -61,7 +61,7 @@ do_install() {
 init_build_dir() {
 	[[ -e "${BUILD_DIR}/web-greeter" ]] && rm -rf "${BUILD_DIR}/web-greeter"
 	[[ -e "${BUILD_DIR}/dist" ]] && rm -rf "${BUILD_DIR}/dist"
-	rsync -a "${REPO_DIR}/web-greeter" "${BUILD_DIR}" --exclude "dist" --exclude "__pycache__"
+	rsync -a "${REPO_DIR}/src/" "${BUILD_DIR}/web-greeter" --exclude "dist" --exclude "__pycache__"
 	rsync -a "${REPO_DIR}/dist" "${BUILD_DIR}"
 	cp "${REPO_DIR}/NEWS.md" "${BUILD_DIR}/dist/NEWS.md"
 	cp "${REPO_DIR}/README.md" "${BUILD_DIR}/web-greeter/"
diff --git a/web-greeter/__init__.py b/src/__init__.py
similarity index 100%
rename from web-greeter/__init__.py
rename to src/__init__.py
diff --git a/web-greeter/__main__.py b/src/__main__.py
similarity index 100%
rename from web-greeter/__main__.py
rename to src/__main__.py
diff --git a/web-greeter/bridge/Config.py b/src/bridge/Config.py
similarity index 100%
rename from web-greeter/bridge/Config.py
rename to src/bridge/Config.py
diff --git a/web-greeter/bridge/Greeter.py b/src/bridge/Greeter.py
similarity index 100%
rename from web-greeter/bridge/Greeter.py
rename to src/bridge/Greeter.py
diff --git a/web-greeter/bridge/ThemeUtils.py b/src/bridge/ThemeUtils.py
similarity index 100%
rename from web-greeter/bridge/ThemeUtils.py
rename to src/bridge/ThemeUtils.py
diff --git a/web-greeter/bridge/__init__.py b/src/bridge/__init__.py
similarity index 100%
rename from web-greeter/bridge/__init__.py
rename to src/bridge/__init__.py
diff --git a/web-greeter/browser/__init__.py b/src/browser/__init__.py
similarity index 100%
rename from web-greeter/browser/__init__.py
rename to src/browser/__init__.py
diff --git a/web-greeter/browser/bridge.py b/src/browser/bridge.py
similarity index 100%
rename from web-greeter/browser/bridge.py
rename to src/browser/bridge.py
diff --git a/web-greeter/browser/browser.py b/src/browser/browser.py
similarity index 100%
rename from web-greeter/browser/browser.py
rename to src/browser/browser.py
diff --git a/web-greeter/browser/error_prompt.py b/src/browser/error_prompt.py
similarity index 100%
rename from web-greeter/browser/error_prompt.py
rename to src/browser/error_prompt.py
diff --git a/web-greeter/browser/interceptor.py b/src/browser/interceptor.py
similarity index 100%
rename from web-greeter/browser/interceptor.py
rename to src/browser/interceptor.py
diff --git a/web-greeter/browser/url_scheme.py b/src/browser/url_scheme.py
similarity index 100%
rename from web-greeter/browser/url_scheme.py
rename to src/browser/url_scheme.py
diff --git a/web-greeter/browser/window.py b/src/browser/window.py
similarity index 100%
rename from web-greeter/browser/window.py
rename to src/browser/window.py
diff --git a/web-greeter/config.py b/src/config.py
similarity index 100%
rename from web-greeter/config.py
rename to src/config.py
diff --git a/web-greeter/globals.py b/src/globals.py
similarity index 100%
rename from web-greeter/globals.py
rename to src/globals.py
diff --git a/web-greeter/logger.py b/src/logger.py
similarity index 100%
rename from web-greeter/logger.py
rename to src/logger.py
diff --git a/web-greeter/requirements.txt b/src/requirements.txt
similarity index 100%
rename from web-greeter/requirements.txt
rename to src/requirements.txt
diff --git a/web-greeter/resources/css/style.css b/src/resources/css/style.css
similarity index 100%
rename from web-greeter/resources/css/style.css
rename to src/resources/css/style.css
diff --git a/web-greeter/resources/js/ThemeUtils.js b/src/resources/js/ThemeUtils.js
similarity index 100%
rename from web-greeter/resources/js/ThemeUtils.js
rename to src/resources/js/ThemeUtils.js
diff --git a/web-greeter/resources/js/bootstrap.js b/src/resources/js/bootstrap.js
similarity index 100%
rename from web-greeter/resources/js/bootstrap.js
rename to src/resources/js/bootstrap.js
diff --git a/web-greeter/resources/js/docs/Greeter.js b/src/resources/js/docs/Greeter.js
similarity index 100%
rename from web-greeter/resources/js/docs/Greeter.js
rename to src/resources/js/docs/Greeter.js
diff --git a/web-greeter/resources/js/docs/GreeterConfig.js b/src/resources/js/docs/GreeterConfig.js
similarity index 100%
rename from web-greeter/resources/js/docs/GreeterConfig.js
rename to src/resources/js/docs/GreeterConfig.js
diff --git a/web-greeter/resources/js/docs/LightDMObjects.js b/src/resources/js/docs/LightDMObjects.js
similarity index 100%
rename from web-greeter/resources/js/docs/LightDMObjects.js
rename to src/resources/js/docs/LightDMObjects.js
diff --git a/web-greeter/resources/resources.qrc b/src/resources/resources.qrc
similarity index 100%
rename from web-greeter/resources/resources.qrc
rename to src/resources/resources.qrc
diff --git a/web-greeter/setup.py b/src/setup.py
similarity index 100%
rename from web-greeter/setup.py
rename to src/setup.py
diff --git a/web-greeter/utils/__init__.py b/src/utils/__init__.py
similarity index 100%
rename from web-greeter/utils/__init__.py
rename to src/utils/__init__.py
diff --git a/web-greeter/utils/battery.py b/src/utils/battery.py
similarity index 100%
rename from web-greeter/utils/battery.py
rename to src/utils/battery.py
diff --git a/web-greeter/utils/brightness.py b/src/utils/brightness.py
similarity index 100%
rename from web-greeter/utils/brightness.py
rename to src/utils/brightness.py
diff --git a/web-greeter/utils/screensaver.py b/src/utils/screensaver.py
similarity index 100%
rename from web-greeter/utils/screensaver.py
rename to src/utils/screensaver.py