From b289da801aa406b07e0d7efbf002eb5bda352227 Mon Sep 17 00:00:00 2001
From: Konrad Neitzel <konrad@kneitzel.de>
Date: Tue, 1 Apr 2025 22:38:29 +0200
Subject: [PATCH] Besseres, universelles Auteilen.

---
 {neitzelfx-example => fx-example}/pom.xml     |  14 ++---
 .../fx}/component/example/Address.java        |   2 +-
 .../fx}/component/example/ExampleApp.java     |   4 +-
 .../neitzel/fx}/component/example/Main.java   |   4 +-
 .../neitzel/fx}/component/example/Person.java |   2 +-
 .../fx}/injectfx/example/JavaFXApp.java       |   4 +-
 .../de/neitzel/fx}/injectfx/example/Main.java |   2 +-
 .../fx}/injectfx/example/MainWindow.java      |   2 +-
 .../src/main/resources/address.fxml           |   2 +-
 .../fx}/injectfx/example/MainWindow.fxml      |   2 +-
 .../src/main/resources/person.fxml            |   2 +-
 .../src/test/resources/testlevel.png          | Bin
 .../neitzelfx-lib.adoc => fx/fx.adoc          |   0
 fx/pom.xml                                    |  52 ++++++++++++++++++
 .../neitzel/fx}/component/AutoViewModel.java  |   2 +-
 .../fx}/component/ComponentController.java    |   2 +-
 .../fx}/component/ComponentLoader.java        |   2 +-
 .../fx}/injectfx/FXMLComponentInstances.java  |   4 +-
 .../injectfx/InjectingControllerFactory.java  |   2 +-
 .../fx}/injectfx/InjectingFXMLLoader.java     |   3 +-
 .../de/neitzel/fx}/mvvm/BindDirection.java    |   2 +-
 .../fx}/mvvm/BindingAwareFXMLLoader.java      |   2 +-
 .../fx}/mvvm/GenericViewController.java       |   2 +-
 .../de/neitzel/fx}/mvvm/GenericViewModel.java |   2 +-
 .../InjectableComponentScannerTest.java       |  13 +++--
 .../testcomponents/test1ok/SuperClass.java    |   4 ++
 .../test1ok/TestComponent1_1.java             |   9 +++
 .../test1ok/TestInterface1_1.java             |   4 ++
 .../test1ok/TestInterface1_2.java             |   4 ++
 .../test1ok/sub/TestComponent1_2.java         |  12 ++++
 .../test2fail/TestComponent2_1.java           |  12 ++++
 {neitzelfx-lib => inject}/pom.xml             |   7 +--
 .../inject}/InjectableComponentScanner.java   |   8 +--
 .../neitzel/inject/annotation/Component.java  |   4 +-
 .../de/neitzel/inject/annotation/Config.java  |   4 +-
 .../testcomponents/test1ok/SuperClass.java    |   4 --
 .../test1ok/TestComponent1_1.java             |   9 ---
 .../test1ok/TestInterface1_1.java             |   4 --
 .../test1ok/TestInterface1_2.java             |   4 --
 .../test1ok/sub/TestComponent1_2.java         |  12 ----
 .../test2fail/TestComponent2_1.java           |  12 ----
 pom.xml                                       |   9 +--
 42 files changed, 151 insertions(+), 99 deletions(-)
 rename {neitzelfx-example => fx-example}/pom.xml (96%)
 rename {neitzelfx-example/src/main/java/de/neitzel/neitzelfx => fx-example/src/main/java/de/neitzel/fx}/component/example/Address.java (74%)
 rename {neitzelfx-example/src/main/java/de/neitzel/neitzelfx => fx-example/src/main/java/de/neitzel/fx}/component/example/ExampleApp.java (90%)
 rename {neitzelfx-example/src/main/java/de/neitzel/neitzelfx => fx-example/src/main/java/de/neitzel/fx}/component/example/Main.java (79%)
 rename {neitzelfx-example/src/main/java/de/neitzel/neitzelfx => fx-example/src/main/java/de/neitzel/fx}/component/example/Person.java (74%)
 rename {neitzelfx-example/src/main/java/de/neitzel/neitzelfx => fx-example/src/main/java/de/neitzel/fx}/injectfx/example/JavaFXApp.java (89%)
 rename {neitzelfx-example/src/main/java/de/neitzel/neitzelfx => fx-example/src/main/java/de/neitzel/fx}/injectfx/example/Main.java (89%)
 rename {neitzelfx-example/src/main/java/de/neitzel/neitzelfx => fx-example/src/main/java/de/neitzel/fx}/injectfx/example/MainWindow.java (93%)
 rename {neitzelfx-example => fx-example}/src/main/resources/address.fxml (88%)
 rename {neitzelfx-example/src/main/resources/de/neitzel/neitzelfx => fx-example/src/main/resources/de/neitzel/fx}/injectfx/example/MainWindow.fxml (87%)
 rename {neitzelfx-example => fx-example}/src/main/resources/person.fxml (89%)
 rename {neitzelfx-example => fx-example}/src/test/resources/testlevel.png (100%)
 rename neitzelfx-lib/neitzelfx-lib.adoc => fx/fx.adoc (100%)
 create mode 100644 fx/pom.xml
 rename {neitzelfx-lib/src/main/java/de/neitzel/neitzelfx => fx/src/main/java/de/neitzel/fx}/component/AutoViewModel.java (98%)
 rename {neitzelfx-lib/src/main/java/de/neitzel/neitzelfx => fx/src/main/java/de/neitzel/fx}/component/ComponentController.java (94%)
 rename {neitzelfx-lib/src/main/java/de/neitzel/neitzelfx => fx/src/main/java/de/neitzel/fx}/component/ComponentLoader.java (99%)
 rename {neitzelfx-lib/src/main/java/de/neitzel/neitzelfx => fx/src/main/java/de/neitzel/fx}/injectfx/FXMLComponentInstances.java (98%)
 rename {neitzelfx-lib/src/main/java/de/neitzel/neitzelfx => fx/src/main/java/de/neitzel/fx}/injectfx/InjectingControllerFactory.java (97%)
 rename {neitzelfx-lib/src/main/java/de/neitzel/neitzelfx => fx/src/main/java/de/neitzel/fx}/injectfx/InjectingFXMLLoader.java (94%)
 rename {neitzelfx-lib/src/main/java/de/neitzel/neitzelfx => fx/src/main/java/de/neitzel/fx}/mvvm/BindDirection.java (97%)
 rename {neitzelfx-lib/src/main/java/de/neitzel/neitzelfx => fx/src/main/java/de/neitzel/fx}/mvvm/BindingAwareFXMLLoader.java (99%)
 rename {neitzelfx-lib/src/main/java/de/neitzel/neitzelfx => fx/src/main/java/de/neitzel/fx}/mvvm/GenericViewController.java (97%)
 rename {neitzelfx-lib/src/main/java/de/neitzel/neitzelfx => fx/src/main/java/de/neitzel/fx}/mvvm/GenericViewModel.java (99%)
 rename {neitzelfx-lib/src/test/java/de/neitzel/neitzelfx => fx/src/test/java/de/neitzel/fx}/injectfx/InjectableComponentScannerTest.java (80%)
 create mode 100644 fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/SuperClass.java
 create mode 100644 fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestComponent1_1.java
 create mode 100644 fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestInterface1_1.java
 create mode 100644 fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestInterface1_2.java
 create mode 100644 fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java
 create mode 100644 fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test2fail/TestComponent2_1.java
 rename {neitzelfx-lib => inject}/pom.xml (87%)
 rename {neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx => inject/src/main/java/de/neitzel/inject}/InjectableComponentScanner.java (98%)
 rename neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java => inject/src/main/java/de/neitzel/inject/annotation/Component.java (72%)
 rename neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java => inject/src/main/java/de/neitzel/inject/annotation/Config.java (76%)
 delete mode 100644 neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java
 delete mode 100644 neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java
 delete mode 100644 neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java
 delete mode 100644 neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java
 delete mode 100644 neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java
 delete mode 100644 neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java

diff --git a/neitzelfx-example/pom.xml b/fx-example/pom.xml
similarity index 96%
rename from neitzelfx-example/pom.xml
rename to fx-example/pom.xml
index 158609d..f5b0b13 100644
--- a/neitzelfx-example/pom.xml
+++ b/fx-example/pom.xml
@@ -5,26 +5,26 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>de.neitzel</groupId>
-        <artifactId>neitzelfx</artifactId>
+        <groupId>de.neitzel.lib</groupId>
+        <artifactId>neitzellib</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>neitzelfx-example</artifactId>
+    <artifactId>fx-example</artifactId>
 
     <properties>
         <link.name>${project.artifactId}</link.name>
         <launcher>${project.artifactId}</launcher>
         <appName>${project.artifactId}</appName>
-        <main.class>de.neitzel.neitzelfx.injectfx.example.Main</main.class>
+        <main.class>de.neitzel.fx.injectfx.example.Main</main.class>
         <jar.filename>${project.artifactId}-${project.version}</jar.filename>
     </properties>
 
     <dependencies>
-        <!-- NeitzelFX dependency -->
+        <!-- FX dependency -->
         <dependency>
-            <groupId>de.neitzel</groupId>
-            <artifactId>neitzelfx-lib</artifactId>
+            <groupId>de.neitzel.lib</groupId>
+            <artifactId>fx</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Address.java b/fx-example/src/main/java/de/neitzel/fx/component/example/Address.java
similarity index 74%
rename from neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Address.java
rename to fx-example/src/main/java/de/neitzel/fx/component/example/Address.java
index 12d9335..9166a04 100644
--- a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Address.java
+++ b/fx-example/src/main/java/de/neitzel/fx/component/example/Address.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.component.example;
+package de.neitzel.fx.component.example;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java b/fx-example/src/main/java/de/neitzel/fx/component/example/ExampleApp.java
similarity index 90%
rename from neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java
rename to fx-example/src/main/java/de/neitzel/fx/component/example/ExampleApp.java
index 6ce3978..d4ef74e 100644
--- a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java
+++ b/fx-example/src/main/java/de/neitzel/fx/component/example/ExampleApp.java
@@ -1,6 +1,6 @@
-package de.neitzel.neitzelfx.component.example;
+package de.neitzel.fx.component.example;
 
-import de.neitzel.neitzelfx.component.ComponentLoader;
+import de.neitzel.fx.component.ComponentLoader;
 import javafx.application.Application;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
diff --git a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Main.java b/fx-example/src/main/java/de/neitzel/fx/component/example/Main.java
similarity index 79%
rename from neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Main.java
rename to fx-example/src/main/java/de/neitzel/fx/component/example/Main.java
index 0e3df0d..80565bb 100644
--- a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Main.java
+++ b/fx-example/src/main/java/de/neitzel/fx/component/example/Main.java
@@ -1,6 +1,4 @@
-package de.neitzel.neitzelfx.component.example;
-
-import de.neitzel.neitzelfx.injectfx.example.JavaFXApp;
+package de.neitzel.fx.component.example;
 
 /**
  * Another Main class as workaround when the JavaFX Application ist started without
diff --git a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Person.java b/fx-example/src/main/java/de/neitzel/fx/component/example/Person.java
similarity index 74%
rename from neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Person.java
rename to fx-example/src/main/java/de/neitzel/fx/component/example/Person.java
index 69babf2..2078450 100644
--- a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Person.java
+++ b/fx-example/src/main/java/de/neitzel/fx/component/example/Person.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.component.example;
+package de.neitzel.fx.component.example;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java b/fx-example/src/main/java/de/neitzel/fx/injectfx/example/JavaFXApp.java
similarity index 89%
rename from neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java
rename to fx-example/src/main/java/de/neitzel/fx/injectfx/example/JavaFXApp.java
index 91937be..2020ead 100644
--- a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java
+++ b/fx-example/src/main/java/de/neitzel/fx/injectfx/example/JavaFXApp.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx.example;
+package de.neitzel.fx.injectfx.example;
 
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
@@ -6,8 +6,6 @@ import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-import java.io.IOException;
-
 public class JavaFXApp extends Application {
 
 	@Override
diff --git a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java b/fx-example/src/main/java/de/neitzel/fx/injectfx/example/Main.java
similarity index 89%
rename from neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java
rename to fx-example/src/main/java/de/neitzel/fx/injectfx/example/Main.java
index 88a30fe..63b5774 100644
--- a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java
+++ b/fx-example/src/main/java/de/neitzel/fx/injectfx/example/Main.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx.example;
+package de.neitzel.fx.injectfx.example;
 
 /**
  * Another Main class as workaround when the JavaFX Application ist started without
diff --git a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java b/fx-example/src/main/java/de/neitzel/fx/injectfx/example/MainWindow.java
similarity index 93%
rename from neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java
rename to fx-example/src/main/java/de/neitzel/fx/injectfx/example/MainWindow.java
index 7888b5e..07fa5c2 100644
--- a/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java
+++ b/fx-example/src/main/java/de/neitzel/fx/injectfx/example/MainWindow.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx.example;
+package de.neitzel.fx.injectfx.example;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
diff --git a/neitzelfx-example/src/main/resources/address.fxml b/fx-example/src/main/resources/address.fxml
similarity index 88%
rename from neitzelfx-example/src/main/resources/address.fxml
rename to fx-example/src/main/resources/address.fxml
index ab51c1e..2bc5a08 100644
--- a/neitzelfx-example/src/main/resources/address.fxml
+++ b/fx-example/src/main/resources/address.fxml
@@ -6,7 +6,7 @@
 <AnchorPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             xmlns:nfx="http://example.com/nfx"
-            fx:controller="de.neitzel.neitzelfx.component.ComponentController"
+            fx:controller="de.neitzel.fx.component.ComponentController"
             prefWidth="300" prefHeight="100">
     <children>
         <TextField layoutX="10" layoutY="10" prefWidth="280"
diff --git a/neitzelfx-example/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml b/fx-example/src/main/resources/de/neitzel/fx/injectfx/example/MainWindow.fxml
similarity index 87%
rename from neitzelfx-example/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml
rename to fx-example/src/main/resources/de/neitzel/fx/injectfx/example/MainWindow.fxml
index bc561e9..0583f78 100644
--- a/neitzelfx-example/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml
+++ b/fx-example/src/main/resources/de/neitzel/fx/injectfx/example/MainWindow.fxml
@@ -3,7 +3,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane prefHeight="127.0" prefWidth="209.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.neitzel.neitzelfx.injectfx.example.MainWindow">
+<AnchorPane prefHeight="127.0" prefWidth="209.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.neitzel.fx.injectfx.example.MainWindow">
    <children>
       <Button fx:id="button" layoutX="44.0" layoutY="70.0" mnemonicParsing="false" onAction="#onButtonClick" text="Click Me" />
       <TextField fx:id="textField" layoutX="14.0" layoutY="24.0" />
diff --git a/neitzelfx-example/src/main/resources/person.fxml b/fx-example/src/main/resources/person.fxml
similarity index 89%
rename from neitzelfx-example/src/main/resources/person.fxml
rename to fx-example/src/main/resources/person.fxml
index afa63fc..01875db 100644
--- a/neitzelfx-example/src/main/resources/person.fxml
+++ b/fx-example/src/main/resources/person.fxml
@@ -6,7 +6,7 @@
 <AnchorPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             xmlns:nfx="http://example.com/nfx"
-            fx:controller="de.neitzel.neitzelfx.component.ComponentController"
+            fx:controller="de.neitzel.fx.component.ComponentController"
             prefWidth="300" prefHeight="180">
     <children>
         <TextField layoutX="10" layoutY="10" prefWidth="280"
diff --git a/neitzelfx-example/src/test/resources/testlevel.png b/fx-example/src/test/resources/testlevel.png
similarity index 100%
rename from neitzelfx-example/src/test/resources/testlevel.png
rename to fx-example/src/test/resources/testlevel.png
diff --git a/neitzelfx-lib/neitzelfx-lib.adoc b/fx/fx.adoc
similarity index 100%
rename from neitzelfx-lib/neitzelfx-lib.adoc
rename to fx/fx.adoc
diff --git a/fx/pom.xml b/fx/pom.xml
new file mode 100644
index 0000000..847f423
--- /dev/null
+++ b/fx/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>de.neitzel.lib</groupId>
+        <artifactId>neitzellib</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>fx</artifactId>
+
+    <properties>
+        <!-- Application Properties -->
+        <link.name>${project.artifactId}</link.name>
+        <launcher>${project.artifactId}</launcher>
+        <appName>${project.artifactId}</appName>
+        <main.class>example.de.neitzel.fx.injectfx.Main</main.class>
+        <jar.filename>${project.artifactId}-${project.version}</jar.filename>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>de.neitzel.lib</groupId>
+            <artifactId>inject</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>${reflections.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${jar.filename}</finalName>
+
+        <plugins>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java b/fx/src/main/java/de/neitzel/fx/component/AutoViewModel.java
similarity index 98%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java
rename to fx/src/main/java/de/neitzel/fx/component/AutoViewModel.java
index f9f50f6..776d5a5 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java
+++ b/fx/src/main/java/de/neitzel/fx/component/AutoViewModel.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.component;
+package de.neitzel.fx.component;
 
 import javafx.beans.property.*;
 import java.lang.reflect.*;
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java b/fx/src/main/java/de/neitzel/fx/component/ComponentController.java
similarity index 94%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java
rename to fx/src/main/java/de/neitzel/fx/component/ComponentController.java
index 45809af..9231af0 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java
+++ b/fx/src/main/java/de/neitzel/fx/component/ComponentController.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.component;
+package de.neitzel.fx.component;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java b/fx/src/main/java/de/neitzel/fx/component/ComponentLoader.java
similarity index 99%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java
rename to fx/src/main/java/de/neitzel/fx/component/ComponentLoader.java
index 2feeda2..84f8bc2 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java
+++ b/fx/src/main/java/de/neitzel/fx/component/ComponentLoader.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.component;
+package de.neitzel.fx.component;
 
 import javafx.beans.property.Property;
 import javafx.fxml.FXMLLoader;
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java b/fx/src/main/java/de/neitzel/fx/injectfx/FXMLComponentInstances.java
similarity index 98%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java
rename to fx/src/main/java/de/neitzel/fx/injectfx/FXMLComponentInstances.java
index 4f8faaa..eba67f3 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java
+++ b/fx/src/main/java/de/neitzel/fx/injectfx/FXMLComponentInstances.java
@@ -1,4 +1,6 @@
-package de.neitzel.neitzelfx.injectfx;
+package de.neitzel.fx.injectfx;
+
+import de.neitzel.inject.InjectableComponentScanner;
 
 import java.lang.reflect.Constructor;
 import java.util.*;
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java b/fx/src/main/java/de/neitzel/fx/injectfx/InjectingControllerFactory.java
similarity index 97%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java
rename to fx/src/main/java/de/neitzel/fx/injectfx/InjectingControllerFactory.java
index 33856d1..deacd83 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java
+++ b/fx/src/main/java/de/neitzel/fx/injectfx/InjectingControllerFactory.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx;
+package de.neitzel.fx.injectfx;
 
 import javafx.util.Callback;
 
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java b/fx/src/main/java/de/neitzel/fx/injectfx/InjectingFXMLLoader.java
similarity index 94%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java
rename to fx/src/main/java/de/neitzel/fx/injectfx/InjectingFXMLLoader.java
index d3309be..0de1b52 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java
+++ b/fx/src/main/java/de/neitzel/fx/injectfx/InjectingFXMLLoader.java
@@ -1,5 +1,6 @@
-package de.neitzel.neitzelfx.injectfx;
+package de.neitzel.fx.injectfx;
 
+import de.neitzel.inject.InjectableComponentScanner;
 import javafx.fxml.FXMLLoader;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java b/fx/src/main/java/de/neitzel/fx/mvvm/BindDirection.java
similarity index 97%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java
rename to fx/src/main/java/de/neitzel/fx/mvvm/BindDirection.java
index b48b226..5bd9a41 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java
+++ b/fx/src/main/java/de/neitzel/fx/mvvm/BindDirection.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.mvvm;
+package de.neitzel.fx.mvvm;
 
 /**
  * Enum representing the direction of data binding between a JavaFX control and a ViewModel property.
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java b/fx/src/main/java/de/neitzel/fx/mvvm/BindingAwareFXMLLoader.java
similarity index 99%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java
rename to fx/src/main/java/de/neitzel/fx/mvvm/BindingAwareFXMLLoader.java
index b5695ce..3ecc3b1 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java
+++ b/fx/src/main/java/de/neitzel/fx/mvvm/BindingAwareFXMLLoader.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.mvvm;
+package de.neitzel.fx.mvvm;
 
 import javafx.beans.property.Property;
 import javafx.beans.property.StringProperty;
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java b/fx/src/main/java/de/neitzel/fx/mvvm/GenericViewController.java
similarity index 97%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java
rename to fx/src/main/java/de/neitzel/fx/mvvm/GenericViewController.java
index 66ec99e..95be892 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java
+++ b/fx/src/main/java/de/neitzel/fx/mvvm/GenericViewController.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.mvvm;
+package de.neitzel.fx.mvvm;
 
 import javafx.fxml.Initializable;
 import java.net.URL;
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java b/fx/src/main/java/de/neitzel/fx/mvvm/GenericViewModel.java
similarity index 99%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java
rename to fx/src/main/java/de/neitzel/fx/mvvm/GenericViewModel.java
index ac18c25..5cc0931 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java
+++ b/fx/src/main/java/de/neitzel/fx/mvvm/GenericViewModel.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.mvvm;
+package de.neitzel.fx.mvvm;
 
 import javafx.beans.property.*;
 
diff --git a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java b/fx/src/test/java/de/neitzel/fx/injectfx/InjectableComponentScannerTest.java
similarity index 80%
rename from neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java
rename to fx/src/test/java/de/neitzel/fx/injectfx/InjectableComponentScannerTest.java
index e9f43c7..6fa7a2f 100644
--- a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java
+++ b/fx/src/test/java/de/neitzel/fx/injectfx/InjectableComponentScannerTest.java
@@ -1,10 +1,11 @@
-package de.neitzel.neitzelfx.injectfx;
+package de.neitzel.fx.injectfx;
 
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.SuperClass;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.TestComponent1_1;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.TestInterface1_1;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.TestInterface1_2;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.sub.TestComponent1_2;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.SuperClass;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.TestComponent1_1;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_1;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_2;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.sub.TestComponent1_2;
+import de.neitzel.inject.InjectableComponentScanner;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/SuperClass.java b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/SuperClass.java
new file mode 100644
index 0000000..3021956
--- /dev/null
+++ b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/SuperClass.java
@@ -0,0 +1,4 @@
+package de.neitzel.fx.injectfx.testcomponents.test1ok;
+
+public class SuperClass {
+}
diff --git a/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestComponent1_1.java b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestComponent1_1.java
new file mode 100644
index 0000000..4f2e7cb
--- /dev/null
+++ b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestComponent1_1.java
@@ -0,0 +1,9 @@
+package de.neitzel.fx.injectfx.testcomponents.test1ok;
+
+import de.neitzel.inject.annotation.Component;
+
+@Component
+public class TestComponent1_1 extends SuperClass implements TestInterface1_2 {
+    public TestComponent1_1() {
+    }
+}
diff --git a/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestInterface1_1.java b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestInterface1_1.java
new file mode 100644
index 0000000..f7b342e
--- /dev/null
+++ b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestInterface1_1.java
@@ -0,0 +1,4 @@
+package de.neitzel.fx.injectfx.testcomponents.test1ok;
+
+public interface TestInterface1_1 {
+}
diff --git a/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestInterface1_2.java b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestInterface1_2.java
new file mode 100644
index 0000000..8c414e8
--- /dev/null
+++ b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestInterface1_2.java
@@ -0,0 +1,4 @@
+package de.neitzel.fx.injectfx.testcomponents.test1ok;
+
+public interface TestInterface1_2 {
+}
diff --git a/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java
new file mode 100644
index 0000000..57e078f
--- /dev/null
+++ b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java
@@ -0,0 +1,12 @@
+package de.neitzel.fx.injectfx.testcomponents.test1ok.sub;
+
+import de.neitzel.fx.injectfx.testcomponents.test1ok.SuperClass;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_1;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_2;
+import de.neitzel.inject.annotation.Component;
+
+@Component
+public class TestComponent1_2 extends SuperClass implements TestInterface1_1, TestInterface1_2 {
+    public TestComponent1_2() {
+    }
+}
diff --git a/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test2fail/TestComponent2_1.java b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test2fail/TestComponent2_1.java
new file mode 100644
index 0000000..4e477af
--- /dev/null
+++ b/fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test2fail/TestComponent2_1.java
@@ -0,0 +1,12 @@
+package de.neitzel.fx.injectfx.testcomponents.test2fail;
+
+import de.neitzel.inject.annotation.Component;
+
+/**
+ * TestComponent1 that should fail.
+ */
+@Component
+public class TestComponent2_1 {
+    public TestComponent2_1(String test) {
+    }
+}
diff --git a/neitzelfx-lib/pom.xml b/inject/pom.xml
similarity index 87%
rename from neitzelfx-lib/pom.xml
rename to inject/pom.xml
index 1faa180..f0eb54d 100644
--- a/neitzelfx-lib/pom.xml
+++ b/inject/pom.xml
@@ -5,19 +5,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>de.neitzel</groupId>
-        <artifactId>neitzelfx</artifactId>
+        <groupId>de.neitzel.lib</groupId>
+        <artifactId>neitzellib</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>neitzelfx-lib</artifactId>
+    <artifactId>inject</artifactId>
 
     <properties>
         <!-- Application Properties -->
         <link.name>${project.artifactId}</link.name>
         <launcher>${project.artifactId}</launcher>
         <appName>${project.artifactId}</appName>
-        <main.class>example.de.neitzel.neitzelfx.injectfx.Main</main.class>
         <jar.filename>${project.artifactId}-${project.version}</jar.filename>
     </properties>
 
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java b/inject/src/main/java/de/neitzel/inject/InjectableComponentScanner.java
similarity index 98%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java
rename to inject/src/main/java/de/neitzel/inject/InjectableComponentScanner.java
index 5791754..66bf98e 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java
+++ b/inject/src/main/java/de/neitzel/inject/InjectableComponentScanner.java
@@ -1,6 +1,6 @@
-package de.neitzel.neitzelfx.injectfx;
+package de.neitzel.inject;
 
-import de.neitzel.neitzelfx.injectfx.annotation.FXMLComponent;
+import de.neitzel.inject.annotation.Component;
 import org.reflections.Reflections;
 
 import java.lang.reflect.Constructor;
@@ -8,7 +8,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * InjectableComponents scans a package for classes annotated with {@link FXMLComponent}.
+ * InjectableComponents scans a package for classes annotated with {@link Component}.
  * It determines which components can be instantiated and manages type mappings for dependency injection.
  */
 public class InjectableComponentScanner {
@@ -46,7 +46,7 @@ public class InjectableComponentScanner {
      */
     private void scanForComponents(String basePackage) {
         Reflections reflections = new Reflections(basePackage);
-        fxmlComponents.addAll(reflections.getTypesAnnotatedWith(FXMLComponent.class));
+        fxmlComponents.addAll(reflections.getTypesAnnotatedWith(Component.class));
     }
 
     /**
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java b/inject/src/main/java/de/neitzel/inject/annotation/Component.java
similarity index 72%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java
rename to inject/src/main/java/de/neitzel/inject/annotation/Component.java
index c18f7a9..87e25b3 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java
+++ b/inject/src/main/java/de/neitzel/inject/annotation/Component.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx.annotation;
+package de.neitzel.inject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -7,5 +7,5 @@ import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface FXMLComponent {
+public @interface Component {
 }
diff --git a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java b/inject/src/main/java/de/neitzel/inject/annotation/Config.java
similarity index 76%
rename from neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java
rename to inject/src/main/java/de/neitzel/inject/annotation/Config.java
index d92c59c..1b0814e 100644
--- a/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java
+++ b/inject/src/main/java/de/neitzel/inject/annotation/Config.java
@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx.annotation;
+package de.neitzel.inject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -7,6 +7,6 @@ import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface FXMLConfig {
+public @interface Config {
     String value() default "";
 }
diff --git a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java
deleted file mode 100644
index 4338fa5..0000000
--- a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test1ok;
-
-public class SuperClass {
-}
diff --git a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java
deleted file mode 100644
index 7ad88ba..0000000
--- a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test1ok;
-
-import de.neitzel.neitzelfx.injectfx.annotation.FXMLComponent;
-
-@FXMLComponent
-public class TestComponent1_1 extends SuperClass implements TestInterface1_2 {
-    public TestComponent1_1() {
-    }
-}
diff --git a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java
deleted file mode 100644
index 6683035..0000000
--- a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test1ok;
-
-public interface TestInterface1_1 {
-}
diff --git a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java
deleted file mode 100644
index fd899b0..0000000
--- a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test1ok;
-
-public interface TestInterface1_2 {
-}
diff --git a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java
deleted file mode 100644
index ba2c0fd..0000000
--- a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.sub;
-
-import de.neitzel.neitzelfx.injectfx.annotation.FXMLComponent;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.SuperClass;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.TestInterface1_1;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.TestInterface1_2;
-
-@FXMLComponent
-public class TestComponent1_2 extends SuperClass implements TestInterface1_1, TestInterface1_2 {
-    public TestComponent1_2() {
-    }
-}
diff --git a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java
deleted file mode 100644
index 3dea0d9..0000000
--- a/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test2fail;
-
-import de.neitzel.neitzelfx.injectfx.annotation.FXMLComponent;
-
-/**
- * TestComponent1 that should fail.
- */
-@FXMLComponent
-public class TestComponent2_1 {
-    public TestComponent2_1(String test) {
-    }
-}
diff --git a/pom.xml b/pom.xml
index 9970037..4b3f87e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,15 +4,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>de.neitzel</groupId>
-    <artifactId>neitzelfx</artifactId>
+    <groupId>de.neitzel.lib</groupId>
+    <artifactId>neitzellib</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
     <modules>
-        <module>neitzelfx-lib</module>
-        <module>neitzelfx-example</module>
+        <module>inject</module>
+        <module>fx</module>
+        <module>fx-example</module>
     </modules>
 
     <properties>