diff --git a/.idea/artifacts/PlayWall_jar.xml b/.idea/artifacts/PlayWall_jar.xml
index 02789ba42d6c35d24313608c2b50e615c70f8547..5e3dd3b51b3e322d81955ae951a2ddadebc01cac 100644
--- a/.idea/artifacts/PlayWall_jar.xml
+++ b/.idea/artifacts/PlayWall_jar.xml
@@ -17,7 +17,6 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/JNA/jna-4.1.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/JNA/jna-platform-4.1.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/HTML/gagawa-1.0.1.jar" path-in-jar="/" />
-      <element id="library" level="application" name="libUtils" />
       <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/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="/" />
@@ -26,7 +25,8 @@
       <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="library" level="application" name="Updater" />
+      <element id="library" level="project" name="libUtils" />
+      <element id="library" level="project" name="Updater" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/ControlsFX.xml b/.idea/libraries/ControlsFX.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3c5d3b2b5d0efa684c08bd6e410e27b23efc6b6d
--- /dev/null
+++ b/.idea/libraries/ControlsFX.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="ControlsFX">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../Libraries/JavaFX/controlsfx-8/controlsfx-8.40.11.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/HTML_Builder.xml b/.idea/libraries/HTML_Builder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fe18f372d580024123a9bb28781a0f44b60bfd97
--- /dev/null
+++ b/.idea/libraries/HTML_Builder.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="HTML Builder">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../Libraries/File Parser/HTML/gagawa-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/JLayer.xml b/.idea/libraries/JLayer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..85982c6f433421dcda1bc4b6b2fa2b0cd2805496
--- /dev/null
+++ b/.idea/libraries/JLayer.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="JLayer">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../Libraries/JLayer1.0.1/jl1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/JNA.xml b/.idea/libraries/JNA.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1b548c9a774ac495a20c02b00cbd1b9628086257
--- /dev/null
+++ b/.idea/libraries/JNA.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="JNA">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../Libraries/JNA/jna-4.1.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../Libraries/JNA/jna-platform-4.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Json.xml b/.idea/libraries/Json.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7cb3f155bd1efeb91e8fa53ceba4b7bd3d4d053c
--- /dev/null
+++ b/.idea/libraries/Json.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Json">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../Libraries/File Parser/Json/json-smart-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Plugins.xml b/.idea/libraries/Plugins.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8900891d70377375127bbf3a9b48bf8d5785c727
--- /dev/null
+++ b/.idea/libraries/Plugins.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Plugins">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../Libraries/jspf/dist/jspf.core-1.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/TinySound.xml b/.idea/libraries/TinySound.xml
new file mode 100644
index 0000000000000000000000000000000000000000..40ae1d47095e39ec0f1f38a5a502b140af0c776c
--- /dev/null
+++ b/.idea/libraries/TinySound.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="TinySound">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../Libraries/tinysound/tinysound-1.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../Libraries/tinysound/lib/jorbis-0.0.17.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../Libraries/tinysound/lib/tritonus_share.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../Libraries/tinysound/lib/vorbisspi1.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Updater.xml b/.idea/libraries/Updater.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6dd0471e4de01b05a3398e5bedc1c5a70048f9df
--- /dev/null
+++ b/.idea/libraries/Updater.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Updater">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/../libs/Updater/bin" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/XML.xml b/.idea/libraries/XML.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a7c3dbd6835ea37ab05765dffd6dbc6375f81506
--- /dev/null
+++ b/.idea/libraries/XML.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="XML">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../Libraries/File Parser/XML/dom4j-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/YML.xml b/.idea/libraries/YML.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ff5e79fed4383ad7002541442c4231ca06d22c6f
--- /dev/null
+++ b/.idea/libraries/YML.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="YML">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../Libraries/File Parser/YAML/guava-15.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../Libraries/File Parser/YAML/snakeyaml-1.11.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../Libraries/File Parser/YAML/YAMLStorage.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/libUtils.xml b/.idea/libraries/libUtils.xml
new file mode 100644
index 0000000000000000000000000000000000000000..efcc95cd14597afb5855abde813e97777ffb8b2d
--- /dev/null
+++ b/.idea/libraries/libUtils.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="libUtils">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/../libs/libUtils/bin" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5e3b38ee5ece1521a828011fad7efd5bde3b6350..6e3a54e9b420e1c14405acb388b6d03da1fd4dc8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,9 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="79f1c12d-cb47-4c05-a8f3-d2eb3588d81c" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/PlayWall/src/META-INF/MANIFEST.MF" />
-    </list>
+    <list default="true" id="79f1c12d-cb47-4c05-a8f3-d2eb3588d81c" name="Default" comment="" />
     <ignored path="$PROJECT_DIR$/PlayWall/bin/" />
     <ignored path="$PROJECT_DIR$/PlayWallCore/bin/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -23,7 +21,40 @@
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
-    <leaf />
+    <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>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -66,65 +97,51 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <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" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PlayWallCore" />
-              <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="PlayWall" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+              <option name="myItemId" value="Plugins" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="Scope" />
-      <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="PlayWall" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemId" value="PlayWallCore" />
+              <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.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PlayWall" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="de.tobias.playpad" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
-    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.last.edited" value="Modules" />
     <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" />
@@ -336,13 +353,23 @@
     </task>
     <servers />
   </component>
+  <component name="TodoView" selected-index="2">
+    <todo-panel id="selected-file">
+      <is-preview-enabled value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+      <is-preview-enabled value="true" />
+    </todo-panel>
+  </component>
   <component name="ToolWindowManager">
     <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.16535018" 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.33" sideWeight="0.5" order="6" 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&#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.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -491,10 +518,45 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/PlayWall/src/de/tobias/playpad/view/PadView.java">
+    <entry file="file://$PROJECT_DIR$/PlayWall/src/de/tobias/playpad/view/PadView.java" />
+    <entry file="file://$PROJECT_DIR$/PlayWallCore/src/de/tobias/playpad/action/ActionSerializer.java">
+      <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>
+    <entry file="file://$PROJECT_DIR$/PlayWall/src/META-INF/MANIFEST.MF">
+      <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>
+    <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>
+    <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>
+    <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="120">
-          <caret line="8" column="33" lean-forward="false" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" />
+        <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>
@@ -518,7 +580,7 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Updater</last-edited>
+          <last-edited>scala-sdk-2.12.1</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -542,12 +604,11 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>PlayWall</last-edited>
+          <last-edited>PlayWallNativeMac</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.2" />
-                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
@@ -567,6 +628,7 @@
       </state>
       <state key="ProjectLibrariesConfigurable.UI">
         <settings>
+          <last-edited>YML</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/PlayWall/PlayWall.iml b/PlayWall/PlayWall.iml
index f28283f5635fdcee56a14c78d15f39c965faa7cd..fed4135d0f0630825e9f23dad02ab117d5d6ec5c 100644
--- a/PlayWall/PlayWall.iml
+++ b/PlayWall/PlayWall.iml
@@ -21,16 +21,17 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" exported="" name="ControlsFX" level="application" />
-    <orderEntry type="library" exported="" name="XML" level="application" />
-    <orderEntry type="library" exported="" name="YML" level="application" />
-    <orderEntry type="library" exported="" name="Plugins" level="application" />
-    <orderEntry type="library" exported="" name="JLayer" level="application" />
-    <orderEntry type="library" exported="" name="TinySound" level="application" />
-    <orderEntry type="library" exported="" name="JNA" level="application" />
-    <orderEntry type="library" exported="" name="HTML Builder" level="application" />
-    <orderEntry type="library" exported="" name="libUtils" level="application" />
-    <orderEntry type="library" exported="" name="Updater" level="application" />
+    <orderEntry type="library" exported="" name="ControlsFX" level="project" />
+    <orderEntry type="library" exported="" name="XML" level="project" />
+    <orderEntry type="library" exported="" name="YML" level="project" />
+    <orderEntry type="library" exported="" name="Plugins" level="project" />
+    <orderEntry type="library" exported="" name="JLayer" level="project" />
+    <orderEntry type="library" exported="" name="TinySound" level="project" />
+    <orderEntry type="library" exported="" name="JNA" level="project" />
+    <orderEntry type="library" exported="" name="HTML Builder" level="project" />
+    <orderEntry type="library" exported="" name="libUtils" level="project" />
+    <orderEntry type="library" exported="" name="Updater" level="project" />
+    <orderEntry type="library" name="Json" level="project" />
     <orderEntry type="library" exported="" name="scala-sdk-2.12.1" level="application" />
   </component>
 </module>
\ No newline at end of file
diff --git a/PlayWallCore/PlayWallCore.iml b/PlayWallCore/PlayWallCore.iml
index ca7b96da80ada3cebc9d1d0fed0901b6ed7edce4..c29f39f9db3eeff7496a9cad8c52d5ad93bba294 100644
--- a/PlayWallCore/PlayWallCore.iml
+++ b/PlayWallCore/PlayWallCore.iml
@@ -10,22 +10,13 @@
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module-library">
-      <library name="junit4">
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="XML" level="application" />
-    <orderEntry type="library" name="YML" level="application" />
-    <orderEntry type="library" name="Plugins" level="application" />
-    <orderEntry type="library" name="JLayer" level="application" />
-    <orderEntry type="library" name="TinySound" level="application" />
-    <orderEntry type="library" name="Json" level="application" />
-    <orderEntry type="library" name="libUtils" level="application" />
-    <orderEntry type="library" name="Updater" level="application" />
+    <orderEntry type="library" name="JLayer" level="project" />
+    <orderEntry type="library" name="Json" level="project" />
+    <orderEntry type="library" name="Plugins" level="project" />
+    <orderEntry type="library" name="TinySound" level="project" />
+    <orderEntry type="library" name="XML" level="project" />
+    <orderEntry type="library" name="YML" level="project" />
+    <orderEntry type="library" name="libUtils" level="project" />
+    <orderEntry type="library" name="Updater" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/PlayWallNativeMac/PlayWallNativeMac.iml b/PlayWallNativeMac/PlayWallNativeMac.iml
index 5cfcac1b88861b4d28fbb0c95f4e051bd542712e..78a5c4728ccc734232a7841b00551357f948b129 100644
--- a/PlayWallNativeMac/PlayWallNativeMac.iml
+++ b/PlayWallNativeMac/PlayWallNativeMac.iml
@@ -10,9 +10,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="module" module-name="PlayWallCore" />
-    <orderEntry type="library" name="YML" level="application" />
-    <orderEntry type="library" name="Plugins" level="application" />
-    <orderEntry type="library" name="Updater" level="application" />
-    <orderEntry type="library" name="libUtils" level="application" />
+    <orderEntry type="library" name="libUtils" level="project" />
+    <orderEntry type="library" name="Updater" level="project" />
+    <orderEntry type="library" name="Plugins" level="project" />
+    <orderEntry type="library" name="YML" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Plugins/Plugins.iml b/Plugins/Plugins.iml
new file mode 100644
index 0000000000000000000000000000000000000000..c90834f2d607afe55e6104d8aa2cdfffb713f688
--- /dev/null
+++ b/Plugins/Plugins.iml
@@ -0,0 +1,11 @@
+<?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