diff --git a/phoenicis-cli/src/main/java/module-info.java b/phoenicis-cli/src/main/java/module-info.java
new file mode 100644
index 00000000000..0b157baa72e
--- /dev/null
+++ b/phoenicis-cli/src/main/java/module-info.java
@@ -0,0 +1,14 @@
+module org.phoenicis.cli {
+    exports org.phoenicis.cli.scriptui;
+    requires commandline;
+    requires org.jsoup;
+    requires org.phoenicis.configuration;
+    requires org.phoenicis.engines;
+    requires org.phoenicis.library;
+    requires org.phoenicis.multithreading;
+    requires org.phoenicis.repository;
+    requires org.phoenicis.scripts;
+    requires org.phoenicis.tools;
+    requires org.phoenicis.win32;
+    requires spring.context;
+}
diff --git a/phoenicis-configuration/src/main/java/module-info.java b/phoenicis-configuration/src/main/java/module-info.java
new file mode 100644
index 00000000000..ec2e836b1ab
--- /dev/null
+++ b/phoenicis-configuration/src/main/java/module-info.java
@@ -0,0 +1,14 @@
+module org.phoenicis.configuration {
+    exports org.phoenicis.configuration;
+    exports org.phoenicis.configuration.localisation;
+    exports org.phoenicis.configuration.security;
+    opens org.phoenicis.configuration;
+    opens org.phoenicis.configuration.localisation;
+    requires com.fasterxml.jackson.databind;
+    requires gettext.commons;
+    requires jackson.annotations;
+    requires slf4j.api;
+    requires spring.beans;
+    requires spring.context;
+    requires spring.core;
+}
diff --git a/phoenicis-containers/src/main/java/module-info.java b/phoenicis-containers/src/main/java/module-info.java
new file mode 100644
index 00000000000..3447e7e7d03
--- /dev/null
+++ b/phoenicis-containers/src/main/java/module-info.java
@@ -0,0 +1,19 @@
+module org.phoenicis.containers {
+    exports org.phoenicis.containers;
+    exports org.phoenicis.containers.dto;
+    opens org.phoenicis.containers;
+    requires com.fasterxml.jackson.core;
+    requires com.fasterxml.jackson.databind;
+    requires jdk.scripting.nashorn;
+    requires org.phoenicis.configuration;
+    requires org.phoenicis.engines;
+    requires org.phoenicis.library;
+    requires org.phoenicis.multithreading;
+    requires org.phoenicis.scripts;
+    requires org.phoenicis.tools;
+    requires org.phoenicis.win32;
+    requires slf4j.api;
+    requires spring.beans;
+    requires spring.context;
+    requires spring.core;
+}
diff --git a/phoenicis-engines/src/main/java/module-info.java b/phoenicis-engines/src/main/java/module-info.java
new file mode 100644
index 00000000000..d01d5f629d7
--- /dev/null
+++ b/phoenicis-engines/src/main/java/module-info.java
@@ -0,0 +1,15 @@
+module org.phoenicis.engines {
+    exports org.phoenicis.engines;
+    exports org.phoenicis.engines.dto;
+    opens org.phoenicis.engines;
+    opens org.phoenicis.engines.dto;
+    requires com.fasterxml.jackson.core;
+    requires com.fasterxml.jackson.databind;
+    requires commons.lang;
+    requires jackson.annotations;
+    requires org.phoenicis.configuration;
+    requires org.phoenicis.repository;
+    requires org.phoenicis.scripts;
+    requires org.phoenicis.tools;
+    requires slf4j.api;
+}
diff --git a/phoenicis-entities/src/main/java/module-info.java b/phoenicis-entities/src/main/java/module-info.java
new file mode 100644
index 00000000000..5d7f5f7500e
--- /dev/null
+++ b/phoenicis-entities/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module org.phoenicis.entities {
+    exports org.phoenicis.entities;
+}
diff --git a/phoenicis-javafx/src/main/java/module-info.java b/phoenicis-javafx/src/main/java/module-info.java
new file mode 100644
index 00000000000..f95321c6e16
--- /dev/null
+++ b/phoenicis-javafx/src/main/java/module-info.java
@@ -0,0 +1,63 @@
+module org.phoenicis.javafx {
+    exports org.phoenicis.javafx;
+    opens org.phoenicis.javafx;
+    opens org.phoenicis.javafx.components.common.widgets.utils;
+    opens org.phoenicis.javafx.controller;
+    opens org.phoenicis.javafx.controller.apps;
+    opens org.phoenicis.javafx.controller.containers;
+    opens org.phoenicis.javafx.controller.engines;
+    opens org.phoenicis.javafx.controller.installations;
+    opens org.phoenicis.javafx.controller.library;
+    opens org.phoenicis.javafx.controller.settings;
+    opens org.phoenicis.javafx.settings;
+    opens org.phoenicis.javafx.views;
+    opens org.phoenicis.javafx.views.common;
+    opens org.phoenicis.javafx.views.mainwindow.apps;
+    opens org.phoenicis.javafx.views.mainwindow.console;
+    opens org.phoenicis.javafx.views.mainwindow.containers;
+    opens org.phoenicis.javafx.views.mainwindow.engines;
+    opens org.phoenicis.javafx.views.mainwindow.installations;
+    opens org.phoenicis.javafx.views.mainwindow.library;
+    opens org.phoenicis.javafx.views.mainwindow.settings;
+    opens org.phoenicis.javafx.views.scriptui;
+    opens org.phoenicis.javafx.themes.breezeDark.icons.mainwindow;
+    opens org.phoenicis.javafx.themes.breezeDark.icons.mainwindow.apps;
+    opens org.phoenicis.javafx.themes.breezeDark.icons.mainwindow.containers;
+    opens org.phoenicis.javafx.themes.breezeDark.icons.mainwindow.engines;
+    opens org.phoenicis.javafx.themes.breezeDark.icons.mainwindow.general;
+    opens org.phoenicis.javafx.themes.breezeDark.icons.mainwindow.library;
+    opens org.phoenicis.javafx.themes.breezeDark.icons.mainwindow.settings;
+    opens org.phoenicis.javafx.themes.standard.icons.mainwindow;
+    opens org.phoenicis.javafx.themes.standard.icons.mainwindow.apps;
+    opens org.phoenicis.javafx.themes.standard.icons.mainwindow.containers;
+    opens org.phoenicis.javafx.themes.standard.icons.mainwindow.engines;
+    opens org.phoenicis.javafx.themes.standard.icons.mainwindow.general;
+    opens org.phoenicis.javafx.themes.standard.icons.mainwindow.installations;
+    opens org.phoenicis.javafx.themes.standard.icons.mainwindow.library;
+    opens org.phoenicis.javafx.themes.standard.icons.mainwindow.settings;
+    requires com.fasterxml.jackson.databind;
+    requires com.google.common;
+    requires commons.lang;
+    requires fuzzywuzzy;
+    requires java.desktop;
+    requires java.sql;
+    requires javafx.base;
+    requires javafx.controls;
+    requires javafx.web;
+    requires jdk.scripting.nashorn;
+    requires org.phoenicis.configuration;
+    requires org.phoenicis.containers;
+    requires org.phoenicis.engines;
+    requires org.phoenicis.entities;
+    requires org.phoenicis.library;
+    requires org.phoenicis.multithreading;
+    requires org.phoenicis.repository;
+    requires org.phoenicis.scripts;
+    requires org.phoenicis.settings;
+    requires org.phoenicis.tools;
+    requires org.phoenicis.win32;
+    requires slf4j.api;
+    requires spring.beans;
+    requires spring.context;
+    requires spring.core;
+}
diff --git a/phoenicis-library/src/main/java/module-info.java b/phoenicis-library/src/main/java/module-info.java
new file mode 100644
index 00000000000..4dda2d360b9
--- /dev/null
+++ b/phoenicis-library/src/main/java/module-info.java
@@ -0,0 +1,15 @@
+module org.phoenicis.library {
+    exports org.phoenicis.library;
+    exports org.phoenicis.library.dto;
+    opens org.phoenicis.library;
+    requires com.fasterxml.jackson.databind;
+    requires commons.lang;
+    requires jdk.scripting.nashorn;
+    requires org.apache.commons.io;
+    requires org.phoenicis.configuration;
+    requires org.phoenicis.multithreading;
+    requires org.phoenicis.scripts;
+    requires slf4j.api;
+    requires spring.beans;
+    requires spring.context;
+}
diff --git a/phoenicis-multithreading/src/main/java/module-info.java b/phoenicis-multithreading/src/main/java/module-info.java
new file mode 100644
index 00000000000..8bf7d12f269
--- /dev/null
+++ b/phoenicis-multithreading/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module org.phoenicis.multithreading {
+    exports org.phoenicis.multithreading;
+    exports org.phoenicis.multithreading.functional;
+    opens org.phoenicis.multithreading;
+    requires commons.lang;
+    requires java.annotation;
+    requires slf4j.api;
+    requires spring.context;
+}
diff --git a/phoenicis-repository/src/main/java/module-info.java b/phoenicis-repository/src/main/java/module-info.java
new file mode 100644
index 00000000000..ffdae532a46
--- /dev/null
+++ b/phoenicis-repository/src/main/java/module-info.java
@@ -0,0 +1,22 @@
+module org.phoenicis.repository {
+    exports org.phoenicis.repository;
+    exports org.phoenicis.repository.dto;
+    exports org.phoenicis.repository.location;
+    exports org.phoenicis.repository.types;
+    opens org.phoenicis.repository;
+    opens org.phoenicis.repository.location;
+    opens org.phoenicis.repository.dto;
+    requires com.fasterxml.jackson.databind;
+    requires commons.lang;
+    requires jackson.annotations;
+    requires org.apache.commons.compress;
+    requires org.eclipse.jgit;
+    requires org.phoenicis.configuration;
+    requires org.phoenicis.entities;
+    requires org.phoenicis.multithreading;
+    requires org.phoenicis.tools;
+    requires slf4j.api;
+    requires spring.beans;
+    requires spring.context;
+    requires spring.core;
+}
diff --git a/phoenicis-scripts/src/main/java/module-info.java b/phoenicis-scripts/src/main/java/module-info.java
new file mode 100644
index 00000000000..399ea008e47
--- /dev/null
+++ b/phoenicis-scripts/src/main/java/module-info.java
@@ -0,0 +1,17 @@
+module org.phoenicis.scripts {
+    exports org.phoenicis.scripts;
+    exports org.phoenicis.scripts.interpreter;
+    exports org.phoenicis.scripts.ui;
+    exports org.phoenicis.scripts.wizard;
+    opens org.phoenicis.scripts;
+    opens org.phoenicis.scripts.wizard;
+    requires java.scripting;
+    requires jdk.scripting.nashorn;
+    requires org.apache.commons.io;
+    requires org.phoenicis.configuration;
+    requires org.phoenicis.entities;
+    requires org.phoenicis.multithreading;
+    requires org.phoenicis.repository;
+    requires spring.beans;
+    requires spring.context;
+}
diff --git a/phoenicis-settings/src/main/java/module-info.java b/phoenicis-settings/src/main/java/module-info.java
new file mode 100644
index 00000000000..4d856f902ae
--- /dev/null
+++ b/phoenicis-settings/src/main/java/module-info.java
@@ -0,0 +1,8 @@
+module org.phoenicis.settings {
+    exports org.phoenicis.settings;
+    opens org.phoenicis.settings;
+    requires org.phoenicis.repository;
+    requires spring.beans;
+    requires spring.context;
+    requires spring.core;
+}
diff --git a/phoenicis-tests/src/main/java/module-info.java b/phoenicis-tests/src/main/java/module-info.java
new file mode 100644
index 00000000000..5fc1f582cca
--- /dev/null
+++ b/phoenicis-tests/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+module org.phoenicis.tests {
+    requires org.apache.commons.io;
+    requires org.phoenicis.cli;
+    requires org.phoenicis.configuration;
+    requires org.phoenicis.entities;
+    requires org.phoenicis.multithreading;
+    requires org.phoenicis.repository;
+    requires org.phoenicis.scripts;
+    requires org.phoenicis.tools;
+    requires org.phoenicis.win32;
+    requires spring.context;
+}
diff --git a/phoenicis-tools/src/main/java/module-info.java b/phoenicis-tools/src/main/java/module-info.java
new file mode 100644
index 00000000000..70f0628315f
--- /dev/null
+++ b/phoenicis-tools/src/main/java/module-info.java
@@ -0,0 +1,36 @@
+module org.phoenicis.tools {
+    exports org.phoenicis.tools;
+    exports org.phoenicis.tools.files;
+    exports org.phoenicis.tools.config;
+    exports org.phoenicis.tools.system;
+    exports org.phoenicis.tools.system.opener;
+    exports org.phoenicis.tools.version;
+    opens org.phoenicis.tools;
+    opens org.phoenicis.tools.archive;
+    opens org.phoenicis.tools.checksum;
+    opens org.phoenicis.tools.config;
+    opens org.phoenicis.tools.files;
+    opens org.phoenicis.tools.gpg;
+    opens org.phoenicis.tools.http;
+    opens org.phoenicis.tools.system;
+    opens org.phoenicis.tools.system.terminal;
+    opens org.phoenicis.tools.version;
+    opens org.phoenicis.tools.win32;
+    requires bcpg.jdk16;
+    requires bcprov.jdk16;
+    requires java.activation;
+    requires jmimemagic;
+    requires com.fasterxml.jackson.core;
+    requires com.fasterxml.jackson.databind;
+    requires com.google.common;
+    requires commons.lang;
+    requires org.apache.commons.codec;
+    requires org.apache.commons.compress;
+    requires org.apache.commons.io;
+    requires org.phoenicis.configuration;
+    requires org.phoenicis.entities;
+    requires org.phoenicis.win32;
+    requires slf4j.api;
+    requires spring.beans;
+    requires spring.context;
+}
diff --git a/phoenicis-win32/src/main/java/module-info.java b/phoenicis-win32/src/main/java/module-info.java
new file mode 100644
index 00000000000..0f70d3705c3
--- /dev/null
+++ b/phoenicis-win32/src/main/java/module-info.java
@@ -0,0 +1,10 @@
+module org.phoenicis.win32 {
+    exports org.phoenicis.win32;
+    exports org.phoenicis.win32.pe;
+    opens org.phoenicis.win32;
+    opens org.phoenicis.win32.registry;
+    requires commons.lang;
+    requires org.apache.commons.io;
+    requires org.phoenicis.configuration;
+    requires spring.context;
+}