diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 99c3795a6ab325569e54155be279d27b83c8e336..1bc9cd60b1eb1d58c548ce5bcb6d53be55126369 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -5,12 +5,13 @@
<file url="file://$PROJECT_DIR$/PlayWall" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PlayWallComponents" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PlayWallCore" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/PlayWallPluginAwake" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/PlayWallPluginEqualizer" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/PlayWallPluginLaunchpad" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/PlayWallPluginMedia" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/PlayWallPluginNativeAudio" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/PlayWallPluginPlayoutLog" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/PlayWallPlugins" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginAwake" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginEqualizer" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginLaunchpad" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginMedia" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginNativeAudio" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginPlayoutLog" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 0a4c845ab06d221c1c6dad3cfe41500ac7874c2e..9bd9790077c9b6f7e6f963b7e4e736cd5919dfff 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -6,12 +6,13 @@
<module fileurl="file://$PROJECT_DIR$/PlayWallComponents/PlayWallComponents.iml" filepath="$PROJECT_DIR$/PlayWallComponents/PlayWallComponents.iml" />
<module fileurl="file://$PROJECT_DIR$/PlayWallCore/PlayWallCore.iml" filepath="$PROJECT_DIR$/PlayWallCore/PlayWallCore.iml" />
<module fileurl="file://$PROJECT_DIR$/PlayWallDesktop.iml" filepath="$PROJECT_DIR$/PlayWallDesktop.iml" />
- <module fileurl="file://$PROJECT_DIR$/PlayWallPluginAwake/PlayWallPluginAwake.iml" filepath="$PROJECT_DIR$/PlayWallPluginAwake/PlayWallPluginAwake.iml" />
- <module fileurl="file://$PROJECT_DIR$/PlayWallPluginEqualizer/PlayWallPluginEqualizer.iml" filepath="$PROJECT_DIR$/PlayWallPluginEqualizer/PlayWallPluginEqualizer.iml" />
- <module fileurl="file://$PROJECT_DIR$/PlayWallPluginLaunchpad/PlayWallPluginLaunchpad.iml" filepath="$PROJECT_DIR$/PlayWallPluginLaunchpad/PlayWallPluginLaunchpad.iml" />
- <module fileurl="file://$PROJECT_DIR$/PlayWallPluginMedia/PlayWallPluginMedia.iml" filepath="$PROJECT_DIR$/PlayWallPluginMedia/PlayWallPluginMedia.iml" />
- <module fileurl="file://$PROJECT_DIR$/PlayWallPluginNativeAudio/PlayWallPluginNativeAudio.iml" filepath="$PROJECT_DIR$/PlayWallPluginNativeAudio/PlayWallPluginNativeAudio.iml" />
- <module fileurl="file://$PROJECT_DIR$/PlayWallPluginPlayoutLog/PlayWallPluginPlayoutLog.iml" filepath="$PROJECT_DIR$/PlayWallPluginPlayoutLog/PlayWallPluginPlayoutLog.iml" />
+ <module fileurl="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginAwake/PlayWallPluginAwake.iml" filepath="$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginAwake/PlayWallPluginAwake.iml" />
+ <module fileurl="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginEqualizer/PlayWallPluginEqualizer.iml" filepath="$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginEqualizer/PlayWallPluginEqualizer.iml" />
+ <module fileurl="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginLaunchpad/PlayWallPluginLaunchpad.iml" filepath="$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginLaunchpad/PlayWallPluginLaunchpad.iml" />
+ <module fileurl="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginMedia/PlayWallPluginMedia.iml" filepath="$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginMedia/PlayWallPluginMedia.iml" />
+ <module fileurl="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginNativeAudio/PlayWallPluginNativeAudio.iml" filepath="$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginNativeAudio/PlayWallPluginNativeAudio.iml" />
+ <module fileurl="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginPlayoutLog/PlayWallPluginPlayoutLog.iml" filepath="$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginPlayoutLog/PlayWallPluginPlayoutLog.iml" />
+ <module fileurl="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPlugins.iml" filepath="$PROJECT_DIR$/PlayWallPlugins/PlayWallPlugins.iml" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/PlayWallPluginAwake/pom.xml b/PlayWallPlugins/PlayWallPluginAwake/pom.xml
similarity index 96%
rename from PlayWallPluginAwake/pom.xml
rename to PlayWallPlugins/PlayWallPluginAwake/pom.xml
index 935f9e4dea311269191e6c07303db29a2a3a7d47..444e187b23b6f835d5d20773c1d35ac138d8fb4c 100644
--- a/PlayWallPluginAwake/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginAwake/pom.xml
@@ -6,14 +6,14 @@
<parent>
<groupId>de.tobias.playpad</groupId>
- <artifactId>PlayWallDesktop</artifactId>
+ <artifactId>PlayWallPlugins</artifactId>
<version>6.2.0-SNAPSHOT</version>
</parent>
<artifactId>PlayWallPluginAwake</artifactId>
<properties>
- <project.outputDirectory>../build/${project.version}</project.outputDirectory>
+ <project.outputDirectory>../../build/${project.version}</project.outputDirectory>
<project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
</properties>
diff --git a/PlayWallPluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakePluginImpl.java b/PlayWallPlugins/PlayWallPluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakePluginImpl.java
similarity index 100%
rename from PlayWallPluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakePluginImpl.java
rename to PlayWallPlugins/PlayWallPluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakePluginImpl.java
diff --git a/PlayWallPluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakeSettings.java b/PlayWallPlugins/PlayWallPluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakeSettings.java
similarity index 100%
rename from PlayWallPluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakeSettings.java
rename to PlayWallPlugins/PlayWallPluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakeSettings.java
diff --git a/PlayWallPluginAwake/src/main/resources/lang/awake_de.properties b/PlayWallPlugins/PlayWallPluginAwake/src/main/resources/lang/awake_de.properties
similarity index 100%
rename from PlayWallPluginAwake/src/main/resources/lang/awake_de.properties
rename to PlayWallPlugins/PlayWallPluginAwake/src/main/resources/lang/awake_de.properties
diff --git a/PlayWallPluginAwake/src/main/resources/plugin.yml b/PlayWallPlugins/PlayWallPluginAwake/src/main/resources/plugin.yml
similarity index 100%
rename from PlayWallPluginAwake/src/main/resources/plugin.yml
rename to PlayWallPlugins/PlayWallPluginAwake/src/main/resources/plugin.yml
diff --git a/PlayWallPluginEqualizer/pom.xml b/PlayWallPlugins/PlayWallPluginEqualizer/pom.xml
similarity index 96%
rename from PlayWallPluginEqualizer/pom.xml
rename to PlayWallPlugins/PlayWallPluginEqualizer/pom.xml
index 316961310b79d1f1ab6a0477a10c23df893eb4ef..d96492589a2c0c07f8ac2ecb6f95017d80dd1b7b 100644
--- a/PlayWallPluginEqualizer/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginEqualizer/pom.xml
@@ -6,14 +6,14 @@
<parent>
<groupId>de.tobias.playpad</groupId>
- <artifactId>PlayWallDesktop</artifactId>
+ <artifactId>PlayWallPlugins</artifactId>
<version>6.2.0-SNAPSHOT</version>
</parent>
<artifactId>PlayWallPluginEqualizer</artifactId>
<properties>
- <project.outputDirectory>../build/${project.version}</project.outputDirectory>
+ <project.outputDirectory>../../build/${project.version}</project.outputDirectory>
<project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
</properties>
diff --git a/PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/Equalizer.java b/PlayWallPlugins/PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/Equalizer.java
similarity index 100%
rename from PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/Equalizer.java
rename to PlayWallPlugins/PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/Equalizer.java
diff --git a/PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/impl/EqualizerPluginImpl.java b/PlayWallPlugins/PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/impl/EqualizerPluginImpl.java
similarity index 100%
rename from PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/impl/EqualizerPluginImpl.java
rename to PlayWallPlugins/PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/impl/EqualizerPluginImpl.java
diff --git a/PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/impl/EqualizerViewController.java b/PlayWallPlugins/PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/impl/EqualizerViewController.java
similarity index 100%
rename from PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/impl/EqualizerViewController.java
rename to PlayWallPlugins/PlayWallPluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/impl/EqualizerViewController.java
diff --git a/PlayWallPluginEqualizer/src/main/resources/lang/equalizer_de.properties b/PlayWallPlugins/PlayWallPluginEqualizer/src/main/resources/lang/equalizer_de.properties
similarity index 100%
rename from PlayWallPluginEqualizer/src/main/resources/lang/equalizer_de.properties
rename to PlayWallPlugins/PlayWallPluginEqualizer/src/main/resources/lang/equalizer_de.properties
diff --git a/PlayWallPluginEqualizer/src/main/resources/plugin.yml b/PlayWallPlugins/PlayWallPluginEqualizer/src/main/resources/plugin.yml
similarity index 100%
rename from PlayWallPluginEqualizer/src/main/resources/plugin.yml
rename to PlayWallPlugins/PlayWallPluginEqualizer/src/main/resources/plugin.yml
diff --git a/PlayWallPluginEqualizer/src/main/resources/style/style.css b/PlayWallPlugins/PlayWallPluginEqualizer/src/main/resources/style/style.css
similarity index 100%
rename from PlayWallPluginEqualizer/src/main/resources/style/style.css
rename to PlayWallPlugins/PlayWallPluginEqualizer/src/main/resources/style/style.css
diff --git a/PlayWallPluginEqualizer/src/main/resources/view/equalizerView.fxml b/PlayWallPlugins/PlayWallPluginEqualizer/src/main/resources/view/equalizerView.fxml
similarity index 100%
rename from PlayWallPluginEqualizer/src/main/resources/view/equalizerView.fxml
rename to PlayWallPlugins/PlayWallPluginEqualizer/src/main/resources/view/equalizerView.fxml
diff --git a/PlayWallPluginLaunchpad/pom.xml b/PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml
similarity index 96%
rename from PlayWallPluginLaunchpad/pom.xml
rename to PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml
index 592679ca5ac4266e4121866e2d7ad505f11878a0..ad1e56e341646dffc4c2746c516512204561e292 100644
--- a/PlayWallPluginLaunchpad/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml
@@ -6,14 +6,14 @@
<parent>
<groupId>de.tobias.playpad</groupId>
- <artifactId>PlayWallDesktop</artifactId>
+ <artifactId>PlayWallPlugins</artifactId>
<version>6.2.0-SNAPSHOT</version>
</parent>
<artifactId>PlayWallPluginLaunchpad</artifactId>
<properties>
- <project.outputDirectory>../build/${project.version}</project.outputDirectory>
+ <project.outputDirectory>../../build/${project.version}</project.outputDirectory>
<project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
</properties>
diff --git a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java
similarity index 100%
rename from PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java
rename to PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java
diff --git a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/MapParser.java b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/MapParser.java
similarity index 100%
rename from PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/MapParser.java
rename to PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/MapParser.java
diff --git a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java
similarity index 100%
rename from PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java
rename to PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java
diff --git a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java
similarity index 100%
rename from PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java
rename to PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java
diff --git a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/s/LaunchPadS.java b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/s/LaunchPadS.java
similarity index 100%
rename from PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/s/LaunchPadS.java
rename to PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/s/LaunchPadS.java
diff --git a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/s/LaunchPadSColor.java b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/s/LaunchPadSColor.java
similarity index 100%
rename from PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/s/LaunchPadSColor.java
rename to PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/s/LaunchPadSColor.java
diff --git a/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2.map b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2.map
similarity index 100%
rename from PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2.map
rename to PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2.map
diff --git a/PlayWallPluginLaunchpad/src/main/resources/plugin.yml b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/plugin.yml
similarity index 100%
rename from PlayWallPluginLaunchpad/src/main/resources/plugin.yml
rename to PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/plugin.yml
diff --git a/PlayWallPluginMedia/pom.xml b/PlayWallPlugins/PlayWallPluginMedia/pom.xml
similarity index 96%
rename from PlayWallPluginMedia/pom.xml
rename to PlayWallPlugins/PlayWallPluginMedia/pom.xml
index 8f5e729cda8a8417f0427191cb27c6147eb41bc6..b8c55132ad891812e2762a1fed4e351c327cb252 100644
--- a/PlayWallPluginMedia/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginMedia/pom.xml
@@ -6,14 +6,14 @@
<parent>
<groupId>de.tobias.playpad</groupId>
- <artifactId>PlayWallDesktop</artifactId>
+ <artifactId>PlayWallPlugins</artifactId>
<version>6.2.0-SNAPSHOT</version>
</parent>
<artifactId>PlayWallPluginMedia</artifactId>
<properties>
- <project.outputDirectory>../build/${project.version}</project.outputDirectory>
+ <project.outputDirectory>../../build/${project.version}</project.outputDirectory>
<project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
</properties>
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackAction.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackAction.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackAction.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackAction.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackActionProvider.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackActionProvider.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackActionProvider.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackActionProvider.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/settings/BlackActionTypeSettingsEntry.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/settings/BlackActionTypeSettingsEntry.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/settings/BlackActionTypeSettingsEntry.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/settings/BlackActionTypeSettingsEntry.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImageContent.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImageContent.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImageContent.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImageContent.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImagePadContentFactory.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImagePadContentFactory.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImagePadContentFactory.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImagePadContentFactory.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/VideoSettings.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/VideoSettings.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/VideoSettings.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/VideoSettings.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaPluginImpl.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaPluginImpl.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaPluginImpl.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaPluginImpl.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaSettingsTabViewController.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaSettingsTabViewController.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaSettingsTabViewController.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaSettingsTabViewController.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaViewController.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaViewController.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaViewController.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaViewController.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/Strings.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/Strings.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/Strings.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/Strings.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoContent.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoContent.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoContent.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoContent.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadContentFactory.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadContentFactory.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadContentFactory.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadContentFactory.java
diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadSettingsTabViewController.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadSettingsTabViewController.java
similarity index 100%
rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadSettingsTabViewController.java
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadSettingsTabViewController.java
diff --git a/PlayWallPluginMedia/src/main/resources/Actions.xml b/PlayWallPlugins/PlayWallPluginMedia/src/main/resources/Actions.xml
similarity index 100%
rename from PlayWallPluginMedia/src/main/resources/Actions.xml
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/resources/Actions.xml
diff --git a/PlayWallPluginMedia/src/main/resources/PadContent.xml b/PlayWallPlugins/PlayWallPluginMedia/src/main/resources/PadContent.xml
similarity index 100%
rename from PlayWallPluginMedia/src/main/resources/PadContent.xml
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/resources/PadContent.xml
diff --git a/PlayWallPluginMedia/src/main/resources/lang/video_de.properties b/PlayWallPlugins/PlayWallPluginMedia/src/main/resources/lang/video_de.properties
similarity index 100%
rename from PlayWallPluginMedia/src/main/resources/lang/video_de.properties
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/resources/lang/video_de.properties
diff --git a/PlayWallPluginMedia/src/main/resources/plugin.yml b/PlayWallPlugins/PlayWallPluginMedia/src/main/resources/plugin.yml
similarity index 100%
rename from PlayWallPluginMedia/src/main/resources/plugin.yml
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/resources/plugin.yml
diff --git a/PlayWallPluginMedia/src/main/resources/view/SettingsPadPane.fxml b/PlayWallPlugins/PlayWallPluginMedia/src/main/resources/view/SettingsPadPane.fxml
similarity index 100%
rename from PlayWallPluginMedia/src/main/resources/view/SettingsPadPane.fxml
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/resources/view/SettingsPadPane.fxml
diff --git a/PlayWallPluginMedia/src/main/resources/view/SettingsPane.fxml b/PlayWallPlugins/PlayWallPluginMedia/src/main/resources/view/SettingsPane.fxml
similarity index 100%
rename from PlayWallPluginMedia/src/main/resources/view/SettingsPane.fxml
rename to PlayWallPlugins/PlayWallPluginMedia/src/main/resources/view/SettingsPane.fxml
diff --git a/PlayWallPluginNativeAudio/j4n/NAudio.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/NAudio.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/NAudio.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/NAudio.dll
diff --git a/PlayWallPluginNativeAudio/j4n/NativeAudio.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/NativeAudio.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/NativeAudio.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/NativeAudio.dll
diff --git a/PlayWallPluginNativeAudio/j4n/NativeAudio.j4n.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/NativeAudio.j4n.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/NativeAudio.j4n.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/NativeAudio.j4n.dll
diff --git a/PlayWallPluginNativeAudio/j4n/NativeAudio.j4n.jar b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/NativeAudio.j4n.jar
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/NativeAudio.j4n.jar
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/NativeAudio.j4n.jar
diff --git a/PlayWallPluginNativeAudio/j4n/NativeAudio.proxygen.xml b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/NativeAudio.proxygen.xml
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/NativeAudio.proxygen.xml
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/NativeAudio.proxygen.xml
diff --git a/PlayWallPluginNativeAudio/j4n/build.cmd b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/build.cmd
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/build.cmd
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/build.cmd
diff --git a/PlayWallPluginNativeAudio/j4n/clr/nativeaudio/LoopStream.generated.cs b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/clr/nativeaudio/LoopStream.generated.cs
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/clr/nativeaudio/LoopStream.generated.cs
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/clr/nativeaudio/LoopStream.generated.cs
diff --git a/PlayWallPluginNativeAudio/j4n/clr/nativeaudio/NativeAudio.generated.cs b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/clr/nativeaudio/NativeAudio.generated.cs
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/clr/nativeaudio/NativeAudio.generated.cs
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/clr/nativeaudio/NativeAudio.generated.cs
diff --git a/PlayWallPluginNativeAudio/j4n/generate.bat b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/generate.bat
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/generate.bat
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/generate.bat
diff --git a/PlayWallPluginNativeAudio/j4n/jni4net.j-0.8.8.0.jar b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jni4net.j-0.8.8.0.jar
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/jni4net.j-0.8.8.0.jar
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jni4net.j-0.8.8.0.jar
diff --git a/PlayWallPluginNativeAudio/j4n/jni4net.n-0.8.8.0.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jni4net.n-0.8.8.0.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/jni4net.n-0.8.8.0.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jni4net.n-0.8.8.0.dll
diff --git a/PlayWallPluginNativeAudio/j4n/jni4net.n.w32.v40-0.8.8.0.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jni4net.n.w32.v40-0.8.8.0.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/jni4net.n.w32.v40-0.8.8.0.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jni4net.n.w32.v40-0.8.8.0.dll
diff --git a/PlayWallPluginNativeAudio/j4n/jni4net.n.w64.v40-0.8.8.0.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jni4net.n.w64.v40-0.8.8.0.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/jni4net.n.w64.v40-0.8.8.0.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jni4net.n.w64.v40-0.8.8.0.dll
diff --git a/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/LoopStream.java b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/LoopStream.java
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/LoopStream.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/LoopStream.java
diff --git a/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/NativeAudio.java b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/NativeAudio.java
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/NativeAudio.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/NativeAudio.java
diff --git a/PlayWallPluginNativeAudio/j4n/proxygen.exe b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/proxygen.exe
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/proxygen.exe
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/proxygen.exe
diff --git a/PlayWallPluginNativeAudio/j4n/proxygen.exe.config b/PlayWallPlugins/PlayWallPluginNativeAudio/j4n/proxygen.exe.config
similarity index 100%
rename from PlayWallPluginNativeAudio/j4n/proxygen.exe.config
rename to PlayWallPlugins/PlayWallPluginNativeAudio/j4n/proxygen.exe.config
diff --git a/PlayWallPluginNativeAudio/pom.xml b/PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml
similarity index 97%
rename from PlayWallPluginNativeAudio/pom.xml
rename to PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml
index 2b7e2e20d9608822c58de07988ba1f99958a99d3..9fac8b74888c1409e8be232738ccf65c2c792acd 100644
--- a/PlayWallPluginNativeAudio/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.tobias.playpad</groupId>
- <artifactId>PlayWallDesktop</artifactId>
+ <artifactId>PlayWallPlugins</artifactId>
<version>6.2.0-SNAPSHOT</version>
</parent>
@@ -15,7 +15,7 @@
<jni4net.j.version>0.8.8.0</jni4net.j.version>
<nativeAudio.version>1.0.0</nativeAudio.version>
- <project.outputDirectory>../build/${project.version}</project.outputDirectory>
+ <project.outputDirectory>../../build/${project.version}</project.outputDirectory>
<project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
</properties>
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/AVAudioPlayerBridge.java b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/AVAudioPlayerBridge.java
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/AVAudioPlayerBridge.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/AVAudioPlayerBridge.java
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/AudioDevice.java b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/AudioDevice.java
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/AudioDevice.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/AudioDevice.java
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandler.java b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandler.java
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandler.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandler.java
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/delegate/AVAudioPlayerBridgeDelegate.java b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/delegate/AVAudioPlayerBridgeDelegate.java
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/delegate/AVAudioPlayerBridgeDelegate.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/delegate/AVAudioPlayerBridgeDelegate.java
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/settings/NativeAudioMacSettingsViewController.java b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/settings/NativeAudioMacSettingsViewController.java
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/settings/NativeAudioMacSettingsViewController.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/settings/NativeAudioMacSettingsViewController.java
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandler.java b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandler.java
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandler.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandler.java
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandlerFactory.java b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandlerFactory.java
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandlerFactory.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandlerFactory.java
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinSettingsViewController.java b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinSettingsViewController.java
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinSettingsViewController.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinSettingsViewController.java
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/plugin/NativeAudioPathType.java b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/plugin/NativeAudioPathType.java
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/plugin/NativeAudioPathType.java
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/plugin/NativeAudioPathType.java
diff --git a/PlayWallPluginNativeAudio/src/main/java/de_tobias_playpad_audio_mac_AVAudioPlayerBridge.h b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de_tobias_playpad_audio_mac_AVAudioPlayerBridge.h
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/java/de_tobias_playpad_audio_mac_AVAudioPlayerBridge.h
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java/de_tobias_playpad_audio_mac_AVAudioPlayerBridge.h
diff --git a/PlayWallPluginNativeAudio/src/main/resources/META-INF/MANIFEST.MF b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/META-INF/MANIFEST.MF
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/META-INF/MANIFEST.MF
diff --git a/PlayWallPluginNativeAudio/src/main/resources/mac/libNativeAudio.dylib b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/mac/libNativeAudio.dylib
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/mac/libNativeAudio.dylib
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/mac/libNativeAudio.dylib
diff --git a/PlayWallPluginNativeAudio/src/main/resources/mac/namacSettings.fxml b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/mac/namacSettings.fxml
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/mac/namacSettings.fxml
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/mac/namacSettings.fxml
diff --git a/PlayWallPluginNativeAudio/src/main/resources/plugin.yml b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/plugin.yml
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/plugin.yml
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/plugin.yml
diff --git a/PlayWallPluginNativeAudio/src/main/resources/win/NAudio.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/NAudio.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/win/NAudio.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/NAudio.dll
diff --git a/PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.dll
diff --git a/PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.j4n.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.j4n.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.j4n.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.j4n.dll
diff --git a/PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.j4n.jar b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.j4n.jar
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.j4n.jar
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/NativeAudio.j4n.jar
diff --git a/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.j-0.8.8.0.jar b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.j-0.8.8.0.jar
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/win/jni4net.j-0.8.8.0.jar
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.j-0.8.8.0.jar
diff --git a/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n-0.8.8.0.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n-0.8.8.0.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n-0.8.8.0.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n-0.8.8.0.dll
diff --git a/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n.w32.v40-0.8.8.0.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n.w32.v40-0.8.8.0.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n.w32.v40-0.8.8.0.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n.w32.v40-0.8.8.0.dll
diff --git a/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n.w64.v40-0.8.8.0.dll b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n.w64.v40-0.8.8.0.dll
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n.w64.v40-0.8.8.0.dll
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/jni4net.n.w64.v40-0.8.8.0.dll
diff --git a/PlayWallPluginNativeAudio/src/main/resources/win/nawinSettings.fxml b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/nawinSettings.fxml
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/resources/win/nawinSettings.fxml
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources/win/nawinSettings.fxml
diff --git a/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/NativeAudioPluginImpl.scala b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/NativeAudioPluginImpl.scala
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/NativeAudioPluginImpl.scala
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/NativeAudioPluginImpl.scala
diff --git a/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/AudioModuleLoader.scala b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/AudioModuleLoader.scala
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/AudioModuleLoader.scala
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/AudioModuleLoader.scala
diff --git a/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/MacAudioImplLoader.scala b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/MacAudioImplLoader.scala
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/MacAudioImplLoader.scala
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/MacAudioImplLoader.scala
diff --git a/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala b/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala
similarity index 100%
rename from PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala
rename to PlayWallPlugins/PlayWallPluginNativeAudio/src/main/scala/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala
diff --git a/PlayWallPluginPlayoutLog/pom.xml b/PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml
similarity index 97%
rename from PlayWallPluginPlayoutLog/pom.xml
rename to PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml
index d4b708cf1764e9bafb361f933c7776dab7c9da6a..5fdb660b52a38ce15eeb43ed639bb4936f1cd27e 100644
--- a/PlayWallPluginPlayoutLog/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml
@@ -3,14 +3,14 @@
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">
<parent>
- <artifactId>PlayWallDesktop</artifactId>
<groupId>de.tobias.playpad</groupId>
+ <artifactId>PlayWallPlugins</artifactId>
<version>6.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
- <project.outputDirectory>../build/${project.version}</project.outputDirectory>
+ <project.outputDirectory>../../build/${project.version}</project.outputDirectory>
<project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
</properties>
diff --git a/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/ColorUtils.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/ColorUtils.java
similarity index 100%
rename from PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/ColorUtils.java
rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/ColorUtils.java
diff --git a/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/PlayoutLogPlugin.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/PlayoutLogPlugin.java
similarity index 100%
rename from PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/PlayoutLogPlugin.java
rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/PlayoutLogPlugin.java
diff --git a/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/Strings.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/Strings.java
similarity index 100%
rename from PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/Strings.java
rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/Strings.java
diff --git a/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/export/PlayoutLogPdfExport.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/export/PlayoutLogPdfExport.java
similarity index 100%
rename from PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/export/PlayoutLogPdfExport.java
rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/export/PlayoutLogPdfExport.java
diff --git a/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/storage/SqlLiteLogSeasonStorageHandler.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/storage/SqlLiteLogSeasonStorageHandler.java
similarity index 100%
rename from PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/storage/SqlLiteLogSeasonStorageHandler.java
rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/storage/SqlLiteLogSeasonStorageHandler.java
diff --git a/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/MainViewControllerListener.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/MainViewControllerListener.java
similarity index 100%
rename from PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/MainViewControllerListener.java
rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/MainViewControllerListener.java
diff --git a/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java
similarity index 100%
rename from PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java
rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java
diff --git a/PlayWallPluginPlayoutLog/src/main/resources/lang/playoutlog_de.properties b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/lang/playoutlog_de.properties
similarity index 100%
rename from PlayWallPluginPlayoutLog/src/main/resources/lang/playoutlog_de.properties
rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/lang/playoutlog_de.properties
diff --git a/PlayWallPluginPlayoutLog/src/main/resources/plugin.yml b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/plugin.yml
similarity index 100%
rename from PlayWallPluginPlayoutLog/src/main/resources/plugin.yml
rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/plugin.yml
diff --git a/PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/PlayOutLogInitializer.scala b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/PlayOutLogInitializer.scala
similarity index 100%
rename from PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/PlayOutLogInitializer.scala
rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/PlayOutLogInitializer.scala
diff --git a/PlayWallPlugins/pom.xml b/PlayWallPlugins/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2a798907fbd602dc6499d7aa0f900ad4e5c23727
--- /dev/null
+++ b/PlayWallPlugins/pom.xml
@@ -0,0 +1,24 @@
+<?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">
+ <parent>
+ <artifactId>PlayWallDesktop</artifactId>
+ <groupId>de.tobias.playpad</groupId>
+ <version>6.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>PlayWallPlugins</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>PlayWallPluginAwake</module>
+ <module>PlayWallPluginEqualizer</module>
+ <module>PlayWallPluginLaunchpad</module>
+ <module>PlayWallPluginMedia</module>
+ <module>PlayWallPluginNativeAudio</module>
+ <module>PlayWallPluginPlayoutLog</module>
+ </modules>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 294006959f45f578e20d45cf3d5656eedc67c49a..c69623941b191668ef39e4bfed49c653f4c6faaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,12 +46,7 @@
<module>PlayWall</module>
<module>PlayWallCore</module>
<module>PlayWallComponents</module>
- <module>PlayWallPluginAwake</module>
- <module>PlayWallPluginEqualizer</module>
- <module>PlayWallPluginLaunchpad</module>
- <module>PlayWallPluginMedia</module>
- <module>PlayWallPluginNativeAudio</module>
- <module>PlayWallPluginPlayoutLog</module>
+ <module>PlayWallPlugins</module>
</modules>
<dependencyManagement>