diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8cbebd017fa63c06f2a8ff5677828249433aa723..863b625be3ed6d911954fdc9909458ee43b16ba9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,6 +5,12 @@
<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" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f4cb416c083d265558da75d457237d671..0000000000000000000000000000000000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6e3a54e9b420e1c14405acb388b6d03da1fd4dc8..ad17cc3e24ffd725ef05cd615593eedf055a3a25 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,27 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
- <list default="true" id="79f1c12d-cb47-4c05-a8f3-d2eb3588d81c" name="Default" comment="" />
+ <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/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/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/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/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/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" />
+ </list>
<ignored path="$PROJECT_DIR$/PlayWall/bin/" />
<ignored path="$PROJECT_DIR$/PlayWallCore/bin/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -21,40 +41,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="PadContent.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PlayWallCore/src/de/tobias/playpad/pad/conntent/PadContent.java">
- <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>
- </file>
- <file leaf-file-name="NativeAudioMacPluginImpl.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPluginImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
- <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>
- </file>
- <file leaf-file-name="NativeAudioMacUpdater.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacUpdater.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <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>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -83,7 +70,7 @@
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
- <navigator currentView="PackagesPane" proportions="" version="1">
+ <navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages PackagesPane="false" />
<showMembers />
<showModules />
@@ -120,17 +107,15 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PlayWallCore" />
+ <option name="myItemId" value="PluginAction" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PlayWall" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PlayWall" />
+ <option name="myItemId" value="actionsplugin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -148,6 +133,15 @@
<property name="last_directory_selection" value="$PROJECT_DIR$/PlayWall/src/de/tobias/playpad" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
</component>
+ <component name="RecentsManager">
+ <key name="MoveFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/PluginLaunchpad/src" />
+ <recent name="$PROJECT_DIR$/PluginEqualizer/src" />
+ <recent name="$PROJECT_DIR$/PluginAction/src" />
+ <recent name="$PROJECT_DIR$/PluginAwake/src" />
+ <recent name="$PROJECT_DIR$/PluginMedia/src" />
+ </key>
+ </component>
<component name="RunManager" selected="Application.PlayPadMain">
<configuration default="false" name="PlayPadMain" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="de.tobias.playpad.PlayPadMain" />
@@ -367,25 +361,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.16324382" 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	" 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.33" sideWeight="0.5" order="7" side_tool="true" 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="Version Control" 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="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="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">
@@ -535,6 +529,14 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacUpdater.java">
+ <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>
<entry file="file://$PROJECT_DIR$/PlayWallCore/src/de/tobias/playpad/pad/conntent/PadContent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
@@ -545,7 +547,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPluginImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
+ <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" />
@@ -553,14 +555,24 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacUpdater.java">
+ <entry file="file://$PROJECT_DIR$/PlayWallCore/src/de/tobias/playpad/action/Action.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" column="36" lean-forward="false" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
+ <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>
+ <entry file="file://$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java">
+ <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>
</component>
<component name="masterDetails">
<states>
@@ -604,11 +616,12 @@
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
- <last-edited>PlayWallNativeMac</last-edited>
+ <last-edited>PlayWallNativeWin</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
+ <option value="0.6" />
</list>
</option>
</splitter-proportions>
diff --git a/PlayWallPlugins/.classpath b/PlayWallPlugins/.classpath
index a6483b754d078603c9f404278f592d1cada08d7e..e2125b9b6109591613ed0e9095e57a474b17b7fa 100644
--- a/PlayWallPlugins/.classpath
+++ b/PlayWallPlugins/.classpath
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry excluding="de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadSOld.java|de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2Old.java|de/tobias/playpad/launchpadplugin/midi/device/s/MultipleFeedbackSViewController.java|de/tobias/playpad/launchpadplugin/midi/device/s/SimpleFeedbackSViewController.java|de/tobias/playpad/launchpadplugin/midi/device/mk2/MultipleFeedbackMK2ViewController.java|de/tobias/playpad/launchpadplugin/midi/device/mk2/SimpleFeedbackMK2ViewController.java|de/tobias/playpad/launchpadplugin/impl/FeedbackMessageTypeCell.java|de/tobias/playpad/launchpadplugin/midi/device/mk2/WarningFeedbackViewControllerMK2.java|de/tobias/playpad/launchpadplugin/midi/device/s/WarningFeedbackViewControllerS.java" kind="src" path="launchpadplugin"/>
- <classpathentry kind="src" path="awakeplugin"/>
- <classpathentry excluding="de/tobias/playpad/midiactions/muteaction/MuteActionSettingsViewController.java|de/tobias/playpad/midiactions/muteaction/MuteActionType.java|de/tobias/playpad/midiactions/muteaction/MuteEvent.java|de/tobias/playpad/midiactions/muteaction/MuteListener.java" kind="src" path="actionsplugin"/>
- <classpathentry kind="src" path="mediaplugin"/>
- <classpathentry kind="src" path="equalizerplugin"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Plugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/XML"/>
diff --git a/PluginAction/PluginAction.iml b/PluginAction/PluginAction.iml
new file mode 100644
index 0000000000000000000000000000000000000000..507d185f5a73b13171dd72436b714cdfcea6b997
--- /dev/null
+++ b/PluginAction/PluginAction.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </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="" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/ActionsPlugin.java b/PluginAction/src/de/tobias/playpad/actionsplugin/ActionsPlugin.java
similarity index 100%
rename from PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/ActionsPlugin.java
rename to PluginAction/src/de/tobias/playpad/actionsplugin/ActionsPlugin.java
diff --git a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/assets/Actions.xml b/PluginAction/src/de/tobias/playpad/actionsplugin/assets/Actions.xml
similarity index 100%
rename from PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/assets/Actions.xml
rename to PluginAction/src/de/tobias/playpad/actionsplugin/assets/Actions.xml
diff --git a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/assets/actions_de.properties b/PluginAction/src/de/tobias/playpad/actionsplugin/assets/actions_de.properties
similarity index 100%
rename from PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/assets/actions_de.properties
rename to PluginAction/src/de/tobias/playpad/actionsplugin/assets/actions_de.properties
diff --git a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginImpl.java b/PluginAction/src/de/tobias/playpad/actionsplugin/impl/ActionsPluginImpl.java
similarity index 100%
rename from PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginImpl.java
rename to PluginAction/src/de/tobias/playpad/actionsplugin/impl/ActionsPluginImpl.java
diff --git a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginUpdater.java b/PluginAction/src/de/tobias/playpad/actionsplugin/impl/ActionsPluginUpdater.java
similarity index 100%
rename from PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginUpdater.java
rename to PluginAction/src/de/tobias/playpad/actionsplugin/impl/ActionsPluginUpdater.java
diff --git a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/muteaction/MuteAction.java b/PluginAction/src/de/tobias/playpad/actionsplugin/muteaction/MuteAction.java
similarity index 100%
rename from PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/muteaction/MuteAction.java
rename to PluginAction/src/de/tobias/playpad/actionsplugin/muteaction/MuteAction.java
diff --git a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/muteaction/MuteActionConnect.java b/PluginAction/src/de/tobias/playpad/actionsplugin/muteaction/MuteActionConnect.java
similarity index 100%
rename from PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/muteaction/MuteActionConnect.java
rename to PluginAction/src/de/tobias/playpad/actionsplugin/muteaction/MuteActionConnect.java
diff --git a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/stopaction/StopAction.java b/PluginAction/src/de/tobias/playpad/actionsplugin/stopaction/StopAction.java
similarity index 100%
rename from PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/stopaction/StopAction.java
rename to PluginAction/src/de/tobias/playpad/actionsplugin/stopaction/StopAction.java
diff --git a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/stopaction/StopActionConnect.java b/PluginAction/src/de/tobias/playpad/actionsplugin/stopaction/StopActionConnect.java
similarity index 100%
rename from PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/stopaction/StopActionConnect.java
rename to PluginAction/src/de/tobias/playpad/actionsplugin/stopaction/StopActionConnect.java
diff --git a/PluginAwake/PluginAwake.iml b/PluginAwake/PluginAwake.iml
new file mode 100644
index 0000000000000000000000000000000000000000..69f2e57031383d1bb982897e6c68b9038fbe4ae6
--- /dev/null
+++ b/PluginAwake/PluginAwake.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </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="module" module-name="PlayWallCore" exported="" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/AwakePlugin.java b/PluginAwake/src/de/tobias/playpad/awakeplugin/AwakePlugin.java
similarity index 100%
rename from PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/AwakePlugin.java
rename to PluginAwake/src/de/tobias/playpad/awakeplugin/AwakePlugin.java
diff --git a/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/AwakeSettings.java b/PluginAwake/src/de/tobias/playpad/awakeplugin/AwakeSettings.java
similarity index 100%
rename from PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/AwakeSettings.java
rename to PluginAwake/src/de/tobias/playpad/awakeplugin/AwakeSettings.java
diff --git a/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/assets/awake_de.properties b/PluginAwake/src/de/tobias/playpad/awakeplugin/assets/awake_de.properties
similarity index 100%
rename from PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/assets/awake_de.properties
rename to PluginAwake/src/de/tobias/playpad/awakeplugin/assets/awake_de.properties
diff --git a/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginImpl.java b/PluginAwake/src/de/tobias/playpad/awakeplugin/impl/AwakePluginImpl.java
similarity index 100%
rename from PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginImpl.java
rename to PluginAwake/src/de/tobias/playpad/awakeplugin/impl/AwakePluginImpl.java
diff --git a/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginUpdater.java b/PluginAwake/src/de/tobias/playpad/awakeplugin/impl/AwakePluginUpdater.java
similarity index 100%
rename from PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginUpdater.java
rename to PluginAwake/src/de/tobias/playpad/awakeplugin/impl/AwakePluginUpdater.java
diff --git a/PluginEqualizer/PluginEqualizer.iml b/PluginEqualizer/PluginEqualizer.iml
new file mode 100644
index 0000000000000000000000000000000000000000..b4f07ab4d1c3c69c32dbea8446a87b85c920dc0d
--- /dev/null
+++ b/PluginEqualizer/PluginEqualizer.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </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="" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/assets/equalizerView.fxml b/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/equalizerView.fxml
similarity index 100%
rename from PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/assets/equalizerView.fxml
rename to PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/equalizerView.fxml
diff --git a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/assets/equalizer_de.properties b/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/equalizer_de.properties
similarity index 100%
rename from PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/assets/equalizer_de.properties
rename to PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/equalizer_de.properties
diff --git a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/assets/style.css b/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/style.css
similarity index 100%
rename from PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/assets/style.css
rename to PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/style.css
diff --git a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/Equalizer.java b/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/Equalizer.java
similarity index 100%
rename from PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/Equalizer.java
rename to PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/Equalizer.java
diff --git a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/EqualizerPlugin.java b/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/EqualizerPlugin.java
similarity index 100%
rename from PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/EqualizerPlugin.java
rename to PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/EqualizerPlugin.java
diff --git a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java b/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java
similarity index 100%
rename from PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java
rename to PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java
diff --git a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginUpdater.java b/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginUpdater.java
similarity index 100%
rename from PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginUpdater.java
rename to PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginUpdater.java
diff --git a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerViewController.java b/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/impl/EqualizerViewController.java
similarity index 100%
rename from PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerViewController.java
rename to PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/impl/EqualizerViewController.java
diff --git a/PluginLaunchpad/PluginLaunchpad.iml b/PluginLaunchpad/PluginLaunchpad.iml
new file mode 100644
index 0000000000000000000000000000000000000000..530bc56d562783afcf99b054a8ae8c778284fc99
--- /dev/null
+++ b/PluginLaunchpad/PluginLaunchpad.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </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="" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/LaunchpadPlugin.java b/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/LaunchpadPlugin.java
similarity index 100%
rename from PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/LaunchpadPlugin.java
rename to PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/LaunchpadPlugin.java
diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/assets/launchpad_de.properties b/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/assets/launchpad_de.properties
similarity index 100%
rename from PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/assets/launchpad_de.properties
rename to PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/assets/launchpad_de.properties
diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/assets/launchpad_mk2.map b/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/assets/launchpad_mk2.map
similarity index 100%
rename from PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/assets/launchpad_mk2.map
rename to PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/assets/launchpad_mk2.map
diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchPadPluginUpdater.java b/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/impl/LaunchPadPluginUpdater.java
similarity index 100%
rename from PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchPadPluginUpdater.java
rename to PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/impl/LaunchPadPluginUpdater.java
diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java b/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java
similarity index 100%
rename from PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java
rename to PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java
diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/MapParser.java b/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/impl/MapParser.java
similarity index 100%
rename from PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/MapParser.java
rename to PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/impl/MapParser.java
diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2.java b/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2.java
similarity index 100%
rename from PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2.java
rename to PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2.java
diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2Color.java b/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2Color.java
similarity index 100%
rename from PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2Color.java
rename to PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2Color.java
diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadS.java b/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadS.java
similarity index 100%
rename from PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadS.java
rename to PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadS.java
diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadSColor.java b/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadSColor.java
similarity index 100%
rename from PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadSColor.java
rename to PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadSColor.java
diff --git a/PluginMedia/PluginMedia.iml b/PluginMedia/PluginMedia.iml
new file mode 100644
index 0000000000000000000000000000000000000000..a6435cc8269d2a7d750ab6b931db140750f0c767
--- /dev/null
+++ b/PluginMedia/PluginMedia.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </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="" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/Actions.xml b/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/Actions.xml
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/Actions.xml
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/assets/Actions.xml
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/PadContent.xml b/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/PadContent.xml
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/PadContent.xml
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/assets/PadContent.xml
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml b/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml b/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/video_de.properties b/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/video_de.properties
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/video_de.properties
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/assets/video_de.properties
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/blindaction/BlindActionConnect.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindActionConnect.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/blindaction/BlindActionConnect.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindActionConnect.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContent.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContent.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContent.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContent.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/MediaPlugin.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/main/MediaPlugin.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/MediaPlugin.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/main/MediaPlugin.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/VideoSettings.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/main/VideoSettings.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/VideoSettings.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/main/VideoSettings.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/Strings.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/Strings.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/Strings.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/Strings.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContent.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContent.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContent.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContent.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java
similarity index 100%
rename from PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java
rename to PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java
diff --git a/Plugins/Plugins.iml b/Plugins/Plugins.iml
deleted file mode 100644
index c90834f2d607afe55e6104d8aa2cdfffb713f688..0000000000000000000000000000000000000000
--- a/Plugins/Plugins.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file