diff --git a/.idea/artifacts/PluginAction_jar.xml b/.idea/artifacts/PluginAction_jar.xml
index 71832ea29810f0d815c40eef199022f38bd3b94a..c70716c71ef8fd500acec5f5407dca22fc8ca679 100644
--- a/.idea/artifacts/PluginAction_jar.xml
+++ b/.idea/artifacts/PluginAction_jar.xml
@@ -3,20 +3,6 @@
     <output-path>$PROJECT_DIR$/out/artifacts/</output-path>
     <root id="archive" name="PluginAction.jar">
       <element id="module-output" name="PluginAction" />
-      <element id="module-output" name="PlayWallCore" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/tinysound-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/jorbis-0.0.17.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/tritonus_share.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/vorbisspi1.0.3.jar" path-in-jar="/" />
-      <element id="library" level="project" name="Updater" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/JLayer1.0.1/jl1.0.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/guava-15.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/snakeyaml-1.11.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/YAMLStorage.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/Json/json-smart-1.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/XML/dom4j-1.6.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/jspf/dist/jspf.core-1.0.2.jar" path-in-jar="/" />
-      <element id="library" level="project" name="libUtils" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/PluginAwake_jar.xml b/.idea/artifacts/PluginAwake_jar.xml
index dfec3ab2e5a53721b662429f3e9f7180d4f1899f..cf93acd558d7434a28c94da31b4421cbbe513397 100644
--- a/.idea/artifacts/PluginAwake_jar.xml
+++ b/.idea/artifacts/PluginAwake_jar.xml
@@ -3,20 +3,6 @@
     <output-path>$PROJECT_DIR$/out/artifacts/</output-path>
     <root id="archive" name="PluginAwake.jar">
       <element id="module-output" name="PluginAwake" />
-      <element id="module-output" name="PlayWallCore" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/tinysound-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/jorbis-0.0.17.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/tritonus_share.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/vorbisspi1.0.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/JLayer1.0.1/jl1.0.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/guava-15.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/snakeyaml-1.11.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/YAMLStorage.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/Json/json-smart-1.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/XML/dom4j-1.6.1.jar" path-in-jar="/" />
-      <element id="library" level="project" name="Updater" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/jspf/dist/jspf.core-1.0.2.jar" path-in-jar="/" />
-      <element id="library" level="project" name="libUtils" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/PluginEqualizer_jar.xml b/.idea/artifacts/PluginEqualizer_jar.xml
index 273fd2e4004c85f48214092a64b86fce7a8ceb17..8dc9f9ea55ccd14d5d00dd113e676eacc3cb55a4 100644
--- a/.idea/artifacts/PluginEqualizer_jar.xml
+++ b/.idea/artifacts/PluginEqualizer_jar.xml
@@ -3,20 +3,6 @@
     <output-path>$PROJECT_DIR$/out/artifacts/</output-path>
     <root id="archive" name="PluginEqualizer.jar">
       <element id="module-output" name="PluginEqualizer" />
-      <element id="module-output" name="PlayWallCore" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/tinysound-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/jorbis-0.0.17.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/tritonus_share.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/vorbisspi1.0.3.jar" path-in-jar="/" />
-      <element id="library" level="project" name="Updater" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/JLayer1.0.1/jl1.0.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/guava-15.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/snakeyaml-1.11.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/YAMLStorage.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/Json/json-smart-1.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/XML/dom4j-1.6.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/jspf/dist/jspf.core-1.0.2.jar" path-in-jar="/" />
-      <element id="library" level="project" name="libUtils" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/PluginLaunchpad_jar.xml b/.idea/artifacts/PluginLaunchpad_jar.xml
index 379b3bee88a59053e512933ea3971961278a3ea6..71d3bed90864b4731913aa60c379c209c74b9784 100644
--- a/.idea/artifacts/PluginLaunchpad_jar.xml
+++ b/.idea/artifacts/PluginLaunchpad_jar.xml
@@ -3,20 +3,6 @@
     <output-path>$PROJECT_DIR$/out/artifacts/</output-path>
     <root id="archive" name="PluginLaunchpad.jar">
       <element id="module-output" name="PluginLaunchpad" />
-      <element id="module-output" name="PlayWallCore" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/XML/dom4j-1.6.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/tinysound-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/jorbis-0.0.17.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/tritonus_share.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/vorbisspi1.0.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/JLayer1.0.1/jl1.0.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/guava-15.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/snakeyaml-1.11.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/YAMLStorage.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/Json/json-smart-1.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/jspf/dist/jspf.core-1.0.2.jar" path-in-jar="/" />
-      <element id="library" level="project" name="Updater" />
-      <element id="library" level="project" name="libUtils" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/PluginMedia_jar.xml b/.idea/artifacts/PluginMedia_jar.xml
index e8469d72442576d9b09310f885d8d643dc963226..47ce2ac137cd3ffac992b719dffc8f41f0142ce4 100644
--- a/.idea/artifacts/PluginMedia_jar.xml
+++ b/.idea/artifacts/PluginMedia_jar.xml
@@ -3,20 +3,6 @@
     <output-path>$PROJECT_DIR$/out/artifacts/</output-path>
     <root id="archive" name="PluginMedia.jar">
       <element id="module-output" name="PluginMedia" />
-      <element id="module-output" name="PlayWallCore" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/tinysound-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/jorbis-0.0.17.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/tritonus_share.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/vorbisspi1.0.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/JLayer1.0.1/jl1.0.1.jar" path-in-jar="/" />
-      <element id="library" level="project" name="libUtils" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/guava-15.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/snakeyaml-1.11.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/YAMLStorage.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/Json/json-smart-1.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/XML/dom4j-1.6.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/jspf/dist/jspf.core-1.0.2.jar" path-in-jar="/" />
-      <element id="library" level="project" name="Updater" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/PluginNativeMac_jar.xml b/.idea/artifacts/PluginNativeMac_jar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bd245b54c17889f981425c59d735c9e96c0d054b
--- /dev/null
+++ b/.idea/artifacts/PluginNativeMac_jar.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="PluginNativeMac:jar">
+    <output-path>$PROJECT_DIR$/out/artifacts/</output-path>
+    <root id="archive" name="PluginNativeMac.jar">
+      <element id="module-output" name="PluginNativeMac" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/PluginNativeWin_jar.xml b/.idea/artifacts/PluginNativeWin_jar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8e9187e62157e641ae642e4b4113cbd42e84e2e3
--- /dev/null
+++ b/.idea/artifacts/PluginNativeWin_jar.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="PluginNativeWin:jar">
+    <output-path>$PROJECT_DIR$/out/artifacts/</output-path>
+    <root id="archive" name="PluginNativeWin.jar">
+      <element id="module-output" name="PluginNativeWin" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 863b625be3ed6d911954fdc9909458ee43b16ba9..aa4991e53c08f118331aaf5081b4005e8cb5b725 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,13 +4,13 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/PlayWall/PlayWall.iml" filepath="$PROJECT_DIR$/PlayWall/PlayWall.iml" />
       <module fileurl="file://$PROJECT_DIR$/PlayWallCore/PlayWallCore.iml" filepath="$PROJECT_DIR$/PlayWallCore/PlayWallCore.iml" />
-      <module fileurl="file://$PROJECT_DIR$/PlayWallNativeMac/PlayWallNativeMac.iml" filepath="$PROJECT_DIR$/PlayWallNativeMac/PlayWallNativeMac.iml" />
-      <module fileurl="file://$PROJECT_DIR$/PlayWallNativeWin/PlayWallNativeWin.iml" filepath="$PROJECT_DIR$/PlayWallNativeWin/PlayWallNativeWin.iml" />
       <module fileurl="file://$PROJECT_DIR$/PluginAction/PluginAction.iml" filepath="$PROJECT_DIR$/PluginAction/PluginAction.iml" />
       <module fileurl="file://$PROJECT_DIR$/PluginAwake/PluginAwake.iml" filepath="$PROJECT_DIR$/PluginAwake/PluginAwake.iml" />
       <module fileurl="file://$PROJECT_DIR$/PluginEqualizer/PluginEqualizer.iml" filepath="$PROJECT_DIR$/PluginEqualizer/PluginEqualizer.iml" />
       <module fileurl="file://$PROJECT_DIR$/PluginLaunchpad/PluginLaunchpad.iml" filepath="$PROJECT_DIR$/PluginLaunchpad/PluginLaunchpad.iml" />
       <module fileurl="file://$PROJECT_DIR$/PluginMedia/PluginMedia.iml" filepath="$PROJECT_DIR$/PluginMedia/PluginMedia.iml" />
+      <module fileurl="file://$PROJECT_DIR$/PlayWallNativeMac/PluginNativeMac.iml" filepath="$PROJECT_DIR$/PlayWallNativeMac/PluginNativeMac.iml" />
+      <module fileurl="file://$PROJECT_DIR$/PlayWallNativeWin/PluginNativeWin.iml" filepath="$PROJECT_DIR$/PlayWallNativeWin/PluginNativeWin.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f1ecf260656b5f9fd49112ece0c104c7195d776c..f9acefda915037be95f7239de12c023d3aeeb61d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,29 +8,31 @@
       <artifact name="PluginEqualizer:jar" />
       <artifact name="PluginLaunchpad:jar" />
       <artifact name="PluginMedia:jar" />
+      <artifact name="PluginNativeMac:jar" />
+      <artifact name="PluginNativeWin:jar" />
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
     <list default="true" id="79f1c12d-cb47-4c05-a8f3-d2eb3588d81c" name="Default" comment="">
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/Actions.xml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/Actions.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/PadContent.xml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/PadContent.xml" />
       <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/video_de.properties" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/video_de.properties" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java" />
       <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/blindaction/BlindActionConnect.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindActionConnect.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/Actions.xml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/Actions.xml" />
       <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContent.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContent.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java" />
       <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/MediaPlugin.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/MediaPlugin.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/VideoSettings.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/VideoSettings.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java" />
       <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/PadContent.xml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/PadContent.xml" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/video_de.properties" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/video_de.properties" />
       <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/Strings.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/Strings.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContent.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContent.java" />
       <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContent.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContent.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/VideoSettings.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/VideoSettings.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java" />
     </list>
     <ignored path="$PROJECT_DIR$/PlayWall/bin/" />
     <ignored path="$PROJECT_DIR$/PlayWallCore/bin/" />
@@ -64,6 +66,7 @@
         <option value="$PROJECT_DIR$/PlayWall/src/de/tobias/playpad/PlayPadMain.java" />
         <option value="$PROJECT_DIR$/PlayWall/.gitignore" />
         <option value="$PROJECT_DIR$/PlayWallCore/.gitignore" />
+        <option value="$PROJECT_DIR$/PluginNativeWin/src/META-INF/MANIFEST.MF" />
       </list>
     </option>
   </component>
@@ -75,7 +78,7 @@
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
+    <navigator currentView="PackagesPane" proportions="" version="1">
       <flattenPackages PackagesPane="false" />
       <showMembers />
       <showModules />
@@ -89,43 +92,57 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
+      <pane id="ProjectPane">
         <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PlayWall" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="Plugins" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemId" value="PluginAction" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="actionsplugin" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
+      <pane id="PackagesPane">
         <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PlayWall" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="PluginAction" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+              <option name="myItemId" value="PlayWall" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
             </PATH_ELEMENT>
+          </PATH>
+          <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+              <option name="myItemId" value="PlayWall" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="actionsplugin" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+              <option name="myItemId" value="PlayWall" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="META-INF" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="Scratches" />
     </panes>
   </component>
@@ -135,10 +152,13 @@
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="SearchEverywhereHistoryKey" value="giti&#9;FILE&#9;file:///Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/src/de/tobias/playpad/.gitignore&#10;IPadViewCon&#9;PSI&#9;JAVA://de.tobias.playpad.pad.viewcontroller.IPadViewController" />
-    <property name="last_directory_selection" value="$PROJECT_DIR$/PlayWall/src/de/tobias/playpad" />
+    <property name="last_directory_selection" value="$PROJECT_DIR$/PluginNativeWin/src" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/PluginNativeWin/src/META-INF" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/PluginLaunchpad/src" />
       <recent name="$PROJECT_DIR$/PluginEqualizer/src" />
@@ -366,25 +386,25 @@
     <frame x="-1920" y="-257" width="1920" height="1057" extended-state="6" />
     <editor active="false" />
     <layout>
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18325435" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.50605583" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.32953367" sideWeight="0.49394417" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18325435" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24960506" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -463,14 +483,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="435">
           <caret line="85" column="0" lean-forward="false" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
-          <folding>
-            <marker date="1483134334000" expanded="false" signature="6719:6724" ph=" { " />
-            <marker date="1483134334000" expanded="false" signature="6764:6767" ph=" }" />
-            <marker date="1483134334000" expanded="false" signature="6806:6811" ph=" { " />
-            <marker date="1483134334000" expanded="false" signature="6838:6841" ph=" }" />
-            <marker date="1483134334000" expanded="false" signature="7012:7017" ph=" { " />
-            <marker date="1483134334000" expanded="false" signature="7029:7032" ph=" }" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -506,7 +518,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
           <caret line="27" column="39" lean-forward="true" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="39" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -522,7 +533,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="408">
           <caret line="73" column="0" lean-forward="true" selection-start-line="73" selection-start-column="0" selection-end-line="73" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -530,7 +540,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -538,7 +547,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-32">
           <caret line="6" column="36" lean-forward="false" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -546,7 +554,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
           <caret line="7" column="16" lean-forward="false" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -554,9 +561,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-47">
           <caret line="19" column="21" lean-forward="false" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -564,7 +568,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
           <caret line="23" column="42" lean-forward="false" selection-start-line="23" selection-start-column="42" selection-end-line="23" selection-end-column="42" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -572,9 +575,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="510">
           <caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -582,6 +582,21 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="223">
           <caret line="166" column="43" lean-forward="true" selection-start-line="166" selection-start-column="43" selection-end-line="166" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PluginNativeWin/j4n/jvm/nativeaudio/LoopStream.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="17" column="59" lean-forward="true" selection-start-line="17" selection-start-column="59" selection-end-line="17" selection-end-column="59" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PluginNativeWin/src/META-INF/MANIFEST.MF">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -592,7 +607,7 @@
       <state key="ArtifactsStructureConfigurable.UI">
         <settings>
           <artifact-editor />
-          <last-edited>PlayWall:jar</last-edited>
+          <last-edited>PluginNativeMac:jar</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -629,7 +644,7 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>PluginAction</last-edited>
+          <last-edited>PluginNativeWin</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/PlayWallNativeMac/PluginNativeMac.iml b/PlayWallNativeMac/PluginNativeMac.iml
new file mode 100644
index 0000000000000000000000000000000000000000..beba9d17d59854268e418b18ada3067502560ef0
--- /dev/null
+++ b/PlayWallNativeMac/PluginNativeMac.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../PluginNativeMac">
+      <sourceFolder url="file://$MODULE_DIR$/../PluginNativeMac/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../PluginNativeMac/test" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="libUtils" level="project" />
+    <orderEntry type="library" name="Plugins" level="project" />
+    <orderEntry type="library" name="Updater" level="project" />
+    <orderEntry type="library" name="XML" level="project" />
+    <orderEntry type="library" name="YML" level="project" />
+    <orderEntry type="module" module-name="PlayWallCore" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/PlayWallNativeWin/PluginNativeWin.iml b/PlayWallNativeWin/PluginNativeWin.iml
new file mode 100644
index 0000000000000000000000000000000000000000..159ac122375b332619157262b07eba014a6cc5df
--- /dev/null
+++ b/PlayWallNativeWin/PluginNativeWin.iml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../PluginNativeWin">
+      <sourceFolder url="file://$MODULE_DIR$/../PluginNativeWin/j4n/jvm" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../PluginNativeWin/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="libUtils" level="project" />
+    <orderEntry type="library" name="Plugins" level="project" />
+    <orderEntry type="library" name="Updater" level="project" />
+    <orderEntry type="library" name="XML" level="project" />
+    <orderEntry type="library" name="YML" level="project" />
+    <orderEntry type="module" module-name="PlayWallCore" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../PluginNativeWin/j4n/jni4net.j-0.8.8.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../PluginNativeWin/j4n/NativeAudio.j4n.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file
diff --git a/PluginAction/PluginAction.iml b/PluginAction/PluginAction.iml
index 507d185f5a73b13171dd72436b714cdfcea6b997..049ef74d2af71d4f280815118f30eb8167d2c853 100644
--- a/PluginAction/PluginAction.iml
+++ b/PluginAction/PluginAction.iml
@@ -7,11 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="Plugins" level="project" />
-    <orderEntry type="library" exported="" name="libUtils" level="project" />
-    <orderEntry type="library" exported="" name="Updater" level="project" />
-    <orderEntry type="library" exported="" name="XML" level="project" />
-    <orderEntry type="library" exported="" name="YML" level="project" />
-    <orderEntry type="module" module-name="PlayWallCore" exported="" />
+    <orderEntry type="library" name="Plugins" level="project" />
+    <orderEntry type="library" name="libUtils" level="project" />
+    <orderEntry type="library" name="Updater" level="project" />
+    <orderEntry type="library" name="XML" level="project" />
+    <orderEntry type="library" name="YML" level="project" />
+    <orderEntry type="module" module-name="PlayWallCore" />
   </component>
 </module>
\ No newline at end of file
diff --git a/PluginAwake/PluginAwake.iml b/PluginAwake/PluginAwake.iml
index cac4fbf2f05bf091fff4f205142a686b1ea6c466..d1da077ed6a3e4a089a9cab72a0efd1a8257ccd4 100644
--- a/PluginAwake/PluginAwake.iml
+++ b/PluginAwake/PluginAwake.iml
@@ -7,12 +7,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="Plugins" level="project" />
-    <orderEntry type="library" exported="" name="libUtils" level="project" />
-    <orderEntry type="library" exported="" name="XML" level="project" />
-    <orderEntry type="library" exported="" name="YML" level="project" />
-    <orderEntry type="library" exported="" name="Updater" level="project" />
-    <orderEntry type="library" exported="" name="JNA" level="project" />
-    <orderEntry type="module" module-name="PlayWallCore" exported="" />
+    <orderEntry type="library" name="Plugins" level="project" />
+    <orderEntry type="library" name="libUtils" level="project" />
+    <orderEntry type="library" name="XML" level="project" />
+    <orderEntry type="library" name="YML" level="project" />
+    <orderEntry type="library" name="Updater" level="project" />
+    <orderEntry type="library" name="JNA" level="project" />
+    <orderEntry type="module" module-name="PlayWallCore" />
   </component>
 </module>
\ No newline at end of file
diff --git a/PluginEqualizer/PluginEqualizer.iml b/PluginEqualizer/PluginEqualizer.iml
index b4f07ab4d1c3c69c32dbea8446a87b85c920dc0d..f1395034d9db0fe08bb2f2ca59b15a1aca2ff4c2 100644
--- a/PluginEqualizer/PluginEqualizer.iml
+++ b/PluginEqualizer/PluginEqualizer.iml
@@ -7,11 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="libUtils" level="project" />
-    <orderEntry type="library" exported="" name="Plugins" level="project" />
-    <orderEntry type="library" exported="" name="Updater" level="project" />
-    <orderEntry type="library" exported="" name="XML" level="project" />
-    <orderEntry type="library" exported="" name="YML" level="project" />
-    <orderEntry type="module" module-name="PlayWallCore" exported="" />
+    <orderEntry type="library" name="libUtils" level="project" />
+    <orderEntry type="library" name="Plugins" level="project" />
+    <orderEntry type="library" name="Updater" level="project" />
+    <orderEntry type="library" name="XML" level="project" />
+    <orderEntry type="library" name="YML" level="project" />
+    <orderEntry type="module" module-name="PlayWallCore" />
   </component>
 </module>
\ No newline at end of file
diff --git a/PluginLaunchpad/PluginLaunchpad.iml b/PluginLaunchpad/PluginLaunchpad.iml
index 530bc56d562783afcf99b054a8ae8c778284fc99..c4924be251e24e4b5ab74b26a76456538e32b361 100644
--- a/PluginLaunchpad/PluginLaunchpad.iml
+++ b/PluginLaunchpad/PluginLaunchpad.iml
@@ -7,11 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="libUtils" level="project" />
-    <orderEntry type="library" exported="" name="Plugins" level="project" />
-    <orderEntry type="library" exported="" name="Updater" level="project" />
-    <orderEntry type="library" exported="" name="YML" level="project" />
-    <orderEntry type="library" exported="" name="XML" level="project" />
-    <orderEntry type="module" module-name="PlayWallCore" exported="" />
+    <orderEntry type="library" name="libUtils" level="project" />
+    <orderEntry type="library" name="Plugins" level="project" />
+    <orderEntry type="library" name="Updater" level="project" />
+    <orderEntry type="library" name="YML" level="project" />
+    <orderEntry type="library" name="XML" level="project" />
+    <orderEntry type="module" module-name="PlayWallCore" />
   </component>
 </module>
\ No newline at end of file
diff --git a/PluginMedia/PluginMedia.iml b/PluginMedia/PluginMedia.iml
index a6435cc8269d2a7d750ab6b931db140750f0c767..356a6662f5c09c3544c5d2462e3eb86e0a806410 100644
--- a/PluginMedia/PluginMedia.iml
+++ b/PluginMedia/PluginMedia.iml
@@ -7,11 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="XML" level="project" />
-    <orderEntry type="library" exported="" name="YML" level="project" />
-    <orderEntry type="library" exported="" name="Updater" level="project" />
-    <orderEntry type="library" exported="" name="Plugins" level="project" />
-    <orderEntry type="library" exported="" name="libUtils" level="project" />
-    <orderEntry type="module" module-name="PlayWallCore" exported="" />
+    <orderEntry type="library" name="XML" level="project" />
+    <orderEntry type="library" name="YML" level="project" />
+    <orderEntry type="library" name="Updater" level="project" />
+    <orderEntry type="library" name="Plugins" level="project" />
+    <orderEntry type="library" name="libUtils" level="project" />
+    <orderEntry type="module" module-name="PlayWallCore" />
   </component>
 </module>
\ No newline at end of file
diff --git a/PlayWallNativeMac/.classpath b/PluginNativeMac/.classpath
similarity index 100%
rename from PlayWallNativeMac/.classpath
rename to PluginNativeMac/.classpath
diff --git a/PlayWallNativeMac/.gitignore b/PluginNativeMac/.gitignore
similarity index 100%
rename from PlayWallNativeMac/.gitignore
rename to PluginNativeMac/.gitignore
diff --git a/PlayWallNativeMac/.project b/PluginNativeMac/.project
similarity index 100%
rename from PlayWallNativeMac/.project
rename to PluginNativeMac/.project
diff --git a/PlayWallNativeMac/.settings/org.eclipse.jdt.core.prefs b/PluginNativeMac/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from PlayWallNativeMac/.settings/org.eclipse.jdt.core.prefs
rename to PluginNativeMac/.settings/org.eclipse.jdt.core.prefs
diff --git a/PlayWallNativeMac/PlayWallNativeMac.iml b/PluginNativeMac/PluginNativeMac.iml
similarity index 100%
rename from PlayWallNativeMac/PlayWallNativeMac.iml
rename to PluginNativeMac/PluginNativeMac.iml
diff --git a/PlayWallNativeMac/src/de/tobias/playpad/NativeAudio.java b/PluginNativeMac/src/de/tobias/playpad/NativeAudio.java
similarity index 100%
rename from PlayWallNativeMac/src/de/tobias/playpad/NativeAudio.java
rename to PluginNativeMac/src/de/tobias/playpad/NativeAudio.java
diff --git a/PlayWallNativeMac/src/de/tobias/playpad/Waveform.java b/PluginNativeMac/src/de/tobias/playpad/Waveform.java
similarity index 100%
rename from PlayWallNativeMac/src/de/tobias/playpad/Waveform.java
rename to PluginNativeMac/src/de/tobias/playpad/Waveform.java
diff --git a/PlayWallNativeMac/src/de/tobias/playpad/libNativeAudio.dylib b/PluginNativeMac/src/de/tobias/playpad/libNativeAudio.dylib
similarity index 100%
rename from PlayWallNativeMac/src/de/tobias/playpad/libNativeAudio.dylib
rename to PluginNativeMac/src/de/tobias/playpad/libNativeAudio.dylib
diff --git a/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacHandler.java b/PluginNativeMac/src/de/tobias/playpad/namac/NativeAudioMacHandler.java
similarity index 100%
rename from PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacHandler.java
rename to PluginNativeMac/src/de/tobias/playpad/namac/NativeAudioMacHandler.java
diff --git a/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacHandlerConnect.java b/PluginNativeMac/src/de/tobias/playpad/namac/NativeAudioMacHandlerConnect.java
similarity index 100%
rename from PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacHandlerConnect.java
rename to PluginNativeMac/src/de/tobias/playpad/namac/NativeAudioMacHandlerConnect.java
diff --git a/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPlugin.java b/PluginNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPlugin.java
similarity index 100%
rename from PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPlugin.java
rename to PluginNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPlugin.java
diff --git a/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPluginImpl.java b/PluginNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPluginImpl.java
similarity index 100%
rename from PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPluginImpl.java
rename to PluginNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPluginImpl.java
diff --git a/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacUpdater.java b/PluginNativeMac/src/de/tobias/playpad/namac/NativeAudioMacUpdater.java
similarity index 100%
rename from PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacUpdater.java
rename to PluginNativeMac/src/de/tobias/playpad/namac/NativeAudioMacUpdater.java
diff --git a/PlayWallNativeMac/src/de/tobias/playpad/view/WaveformView.java b/PluginNativeMac/src/de/tobias/playpad/view/WaveformView.java
similarity index 100%
rename from PlayWallNativeMac/src/de/tobias/playpad/view/WaveformView.java
rename to PluginNativeMac/src/de/tobias/playpad/view/WaveformView.java
diff --git a/PlayWallNativeMac/src/de_tobias_playpad_NativeAudio.h b/PluginNativeMac/src/de_tobias_playpad_NativeAudio.h
similarity index 100%
rename from PlayWallNativeMac/src/de_tobias_playpad_NativeAudio.h
rename to PluginNativeMac/src/de_tobias_playpad_NativeAudio.h
diff --git a/PlayWallNativeMac/src/de_tobias_playpad_Waveform.h b/PluginNativeMac/src/de_tobias_playpad_Waveform.h
similarity index 100%
rename from PlayWallNativeMac/src/de_tobias_playpad_Waveform.h
rename to PluginNativeMac/src/de_tobias_playpad_Waveform.h
diff --git a/PlayWallNativeMac/test/de/tobias/playpad/NativeAudioTest.java b/PluginNativeMac/test/de/tobias/playpad/NativeAudioTest.java
similarity index 100%
rename from PlayWallNativeMac/test/de/tobias/playpad/NativeAudioTest.java
rename to PluginNativeMac/test/de/tobias/playpad/NativeAudioTest.java
diff --git a/PlayWallNativeMac/test/de/tobias/playpad/WaveformTest.java b/PluginNativeMac/test/de/tobias/playpad/WaveformTest.java
similarity index 100%
rename from PlayWallNativeMac/test/de/tobias/playpad/WaveformTest.java
rename to PluginNativeMac/test/de/tobias/playpad/WaveformTest.java
diff --git a/PlayWallNativeWin/.classpath b/PluginNativeWin/.classpath
similarity index 100%
rename from PlayWallNativeWin/.classpath
rename to PluginNativeWin/.classpath
diff --git a/PlayWallNativeWin/.gitignore b/PluginNativeWin/.gitignore
similarity index 100%
rename from PlayWallNativeWin/.gitignore
rename to PluginNativeWin/.gitignore
diff --git a/PlayWallNativeWin/.project b/PluginNativeWin/.project
similarity index 100%
rename from PlayWallNativeWin/.project
rename to PluginNativeWin/.project
diff --git a/PlayWallNativeWin/.settings/org.eclipse.jdt.core.prefs b/PluginNativeWin/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from PlayWallNativeWin/.settings/org.eclipse.jdt.core.prefs
rename to PluginNativeWin/.settings/org.eclipse.jdt.core.prefs
diff --git a/PlayWallNativeWin/MANIFEST.MF b/PluginNativeWin/MANIFEST.MF
similarity index 100%
rename from PlayWallNativeWin/MANIFEST.MF
rename to PluginNativeWin/MANIFEST.MF
diff --git a/PlayWallNativeWin/PlayWallNativeWin.iml b/PluginNativeWin/PluginNativeWin.iml
similarity index 100%
rename from PlayWallNativeWin/PlayWallNativeWin.iml
rename to PluginNativeWin/PluginNativeWin.iml
diff --git a/PlayWallNativeWin/j4n/NAudio.dll b/PluginNativeWin/j4n/NAudio.dll
similarity index 100%
rename from PlayWallNativeWin/j4n/NAudio.dll
rename to PluginNativeWin/j4n/NAudio.dll
diff --git a/PlayWallNativeWin/j4n/NativeAudio.dll b/PluginNativeWin/j4n/NativeAudio.dll
similarity index 100%
rename from PlayWallNativeWin/j4n/NativeAudio.dll
rename to PluginNativeWin/j4n/NativeAudio.dll
diff --git a/PlayWallNativeWin/j4n/NativeAudio.j4n.dll b/PluginNativeWin/j4n/NativeAudio.j4n.dll
similarity index 100%
rename from PlayWallNativeWin/j4n/NativeAudio.j4n.dll
rename to PluginNativeWin/j4n/NativeAudio.j4n.dll
diff --git a/PlayWallNativeWin/j4n/NativeAudio.j4n.jar b/PluginNativeWin/j4n/NativeAudio.j4n.jar
similarity index 100%
rename from PlayWallNativeWin/j4n/NativeAudio.j4n.jar
rename to PluginNativeWin/j4n/NativeAudio.j4n.jar
diff --git a/PlayWallNativeWin/j4n/NativeAudio.proxygen.xml b/PluginNativeWin/j4n/NativeAudio.proxygen.xml
similarity index 100%
rename from PlayWallNativeWin/j4n/NativeAudio.proxygen.xml
rename to PluginNativeWin/j4n/NativeAudio.proxygen.xml
diff --git a/PlayWallNativeWin/j4n/build.cmd b/PluginNativeWin/j4n/build.cmd
similarity index 100%
rename from PlayWallNativeWin/j4n/build.cmd
rename to PluginNativeWin/j4n/build.cmd
diff --git a/PlayWallNativeWin/j4n/clr/nativeaudio/LoopStream.generated.cs b/PluginNativeWin/j4n/clr/nativeaudio/LoopStream.generated.cs
similarity index 100%
rename from PlayWallNativeWin/j4n/clr/nativeaudio/LoopStream.generated.cs
rename to PluginNativeWin/j4n/clr/nativeaudio/LoopStream.generated.cs
diff --git a/PlayWallNativeWin/j4n/clr/nativeaudio/NativeAudio.generated.cs b/PluginNativeWin/j4n/clr/nativeaudio/NativeAudio.generated.cs
similarity index 100%
rename from PlayWallNativeWin/j4n/clr/nativeaudio/NativeAudio.generated.cs
rename to PluginNativeWin/j4n/clr/nativeaudio/NativeAudio.generated.cs
diff --git a/PlayWallNativeWin/j4n/generate.bat b/PluginNativeWin/j4n/generate.bat
similarity index 100%
rename from PlayWallNativeWin/j4n/generate.bat
rename to PluginNativeWin/j4n/generate.bat
diff --git a/PlayWallNativeWin/j4n/jni4net.j-0.8.8.0.jar b/PluginNativeWin/j4n/jni4net.j-0.8.8.0.jar
similarity index 100%
rename from PlayWallNativeWin/j4n/jni4net.j-0.8.8.0.jar
rename to PluginNativeWin/j4n/jni4net.j-0.8.8.0.jar
diff --git a/PlayWallNativeWin/j4n/jni4net.n-0.8.8.0.dll b/PluginNativeWin/j4n/jni4net.n-0.8.8.0.dll
similarity index 100%
rename from PlayWallNativeWin/j4n/jni4net.n-0.8.8.0.dll
rename to PluginNativeWin/j4n/jni4net.n-0.8.8.0.dll
diff --git a/PlayWallNativeWin/j4n/jni4net.n.w32.v40-0.8.8.0.dll b/PluginNativeWin/j4n/jni4net.n.w32.v40-0.8.8.0.dll
similarity index 100%
rename from PlayWallNativeWin/j4n/jni4net.n.w32.v40-0.8.8.0.dll
rename to PluginNativeWin/j4n/jni4net.n.w32.v40-0.8.8.0.dll
diff --git a/PlayWallNativeWin/j4n/jni4net.n.w64.v40-0.8.8.0.dll b/PluginNativeWin/j4n/jni4net.n.w64.v40-0.8.8.0.dll
similarity index 100%
rename from PlayWallNativeWin/j4n/jni4net.n.w64.v40-0.8.8.0.dll
rename to PluginNativeWin/j4n/jni4net.n.w64.v40-0.8.8.0.dll
diff --git a/PlayWallNativeWin/j4n/jvm/nativeaudio/LoopStream.java b/PluginNativeWin/j4n/jvm/nativeaudio/LoopStream.java
similarity index 100%
rename from PlayWallNativeWin/j4n/jvm/nativeaudio/LoopStream.java
rename to PluginNativeWin/j4n/jvm/nativeaudio/LoopStream.java
diff --git a/PlayWallNativeWin/j4n/jvm/nativeaudio/NativeAudio.java b/PluginNativeWin/j4n/jvm/nativeaudio/NativeAudio.java
similarity index 100%
rename from PlayWallNativeWin/j4n/jvm/nativeaudio/NativeAudio.java
rename to PluginNativeWin/j4n/jvm/nativeaudio/NativeAudio.java
diff --git a/PlayWallNativeWin/j4n/proxygen.exe b/PluginNativeWin/j4n/proxygen.exe
similarity index 100%
rename from PlayWallNativeWin/j4n/proxygen.exe
rename to PluginNativeWin/j4n/proxygen.exe
diff --git a/PlayWallNativeWin/j4n/proxygen.exe.config b/PluginNativeWin/j4n/proxygen.exe.config
similarity index 100%
rename from PlayWallNativeWin/j4n/proxygen.exe.config
rename to PluginNativeWin/j4n/proxygen.exe.config
diff --git a/PlayWallNativeWin/j4n/target/classes/nativeaudio/LoopStream.class b/PluginNativeWin/j4n/target/classes/nativeaudio/LoopStream.class
similarity index 100%
rename from PlayWallNativeWin/j4n/target/classes/nativeaudio/LoopStream.class
rename to PluginNativeWin/j4n/target/classes/nativeaudio/LoopStream.class
diff --git a/PlayWallNativeWin/j4n/target/classes/nativeaudio/NativeAudio.class b/PluginNativeWin/j4n/target/classes/nativeaudio/NativeAudio.class
similarity index 100%
rename from PlayWallNativeWin/j4n/target/classes/nativeaudio/NativeAudio.class
rename to PluginNativeWin/j4n/target/classes/nativeaudio/NativeAudio.class
diff --git a/PluginNativeWin/src/META-INF/MANIFEST.MF b/PluginNativeWin/src/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..eeb2a06cb316a736ee9a6705b198d6a0156eed29
--- /dev/null
+++ b/PluginNativeWin/src/META-INF/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Class-Path: . nawin/jni4net.j-0.8.8.0.jar nawin/NativeAudio.j4n.jar
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPlugin.java b/PluginNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPlugin.java
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPlugin.java
rename to PluginNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPlugin.java
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPluginImpl.java b/PluginNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPluginImpl.java
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPluginImpl.java
rename to PluginNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPluginImpl.java
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinUpdater.java b/PluginNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinUpdater.java
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinUpdater.java
rename to PluginNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinUpdater.java
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/NAudio.dll b/PluginNativeWin/src/de/tobias/playpad/nawin/assets/NAudio.dll
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/NAudio.dll
rename to PluginNativeWin/src/de/tobias/playpad/nawin/assets/NAudio.dll
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.dll b/PluginNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.dll
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.dll
rename to PluginNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.dll
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.j4n.dll b/PluginNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.j4n.dll
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.j4n.dll
rename to PluginNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.j4n.dll
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.j4n.jar b/PluginNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.j4n.jar
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.j4n.jar
rename to PluginNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.j4n.jar
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/Test-Sound.wav b/PluginNativeWin/src/de/tobias/playpad/nawin/assets/Test-Sound.wav
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/Test-Sound.wav
rename to PluginNativeWin/src/de/tobias/playpad/nawin/assets/Test-Sound.wav
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.j-0.8.8.0.jar b/PluginNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.j-0.8.8.0.jar
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.j-0.8.8.0.jar
rename to PluginNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.j-0.8.8.0.jar
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n-0.8.8.0.dll b/PluginNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n-0.8.8.0.dll
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n-0.8.8.0.dll
rename to PluginNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n-0.8.8.0.dll
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n.w32.v40-0.8.8.0.dll b/PluginNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n.w32.v40-0.8.8.0.dll
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n.w32.v40-0.8.8.0.dll
rename to PluginNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n.w32.v40-0.8.8.0.dll
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n.w64.v40-0.8.8.0.dll b/PluginNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n.w64.v40-0.8.8.0.dll
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n.w64.v40-0.8.8.0.dll
rename to PluginNativeWin/src/de/tobias/playpad/nawin/assets/jni4net.n.w64.v40-0.8.8.0.dll
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/nawinSettings.fxml b/PluginNativeWin/src/de/tobias/playpad/nawin/assets/nawinSettings.fxml
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/nawinSettings.fxml
rename to PluginNativeWin/src/de/tobias/playpad/nawin/assets/nawinSettings.fxml
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioSettingsViewController.java b/PluginNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioSettingsViewController.java
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioSettingsViewController.java
rename to PluginNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioSettingsViewController.java
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioWinHandler.java b/PluginNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioWinHandler.java
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioWinHandler.java
rename to PluginNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioWinHandler.java
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioWinHandlerConnect.java b/PluginNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioWinHandlerConnect.java
similarity index 100%
rename from PlayWallNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioWinHandlerConnect.java
rename to PluginNativeWin/src/de/tobias/playpad/nawin/audio/NativeAudioWinHandlerConnect.java