diff --git a/TagTunes.xcodeproj/project.xcworkspace/xcuserdata/Kim.xcuserdatad/UserInterfaceState.xcuserstate b/TagTunes.xcodeproj/project.xcworkspace/xcuserdata/Kim.xcuserdatad/UserInterfaceState.xcuserstate
index 234cc11..6181519 100644
Binary files a/TagTunes.xcodeproj/project.xcworkspace/xcuserdata/Kim.xcuserdatad/UserInterfaceState.xcuserstate and b/TagTunes.xcodeproj/project.xcworkspace/xcuserdata/Kim.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/TagTunes.xcodeproj/xcuserdata/Kim.xcuserdatad/xcschemes/TagTunes.xcscheme b/TagTunes.xcodeproj/xcuserdata/Kim.xcuserdatad/xcschemes/TagTunes.xcscheme
index dbd16b1..1c99f23 100644
--- a/TagTunes.xcodeproj/xcuserdata/Kim.xcuserdatad/xcschemes/TagTunes.xcscheme
+++ b/TagTunes.xcodeproj/xcuserdata/Kim.xcuserdatad/xcschemes/TagTunes.xcscheme
@@ -5,6 +5,22 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3B76C76E1B909B280025D550"
+               BuildableName = "TagTunes.app"
+               BlueprintName = "TagTunes"
+               ReferencedContainer = "container:TagTunes.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
@@ -12,7 +28,36 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3B76C77F1B909B280025D550"
+               BuildableName = "TagTunesTests.xctest"
+               BlueprintName = "TagTunesTests"
+               ReferencedContainer = "container:TagTunes.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3B76C78A1B909B280025D550"
+               BuildableName = "TagTunesUITests.xctest"
+               BlueprintName = "TagTunesUITests"
+               ReferencedContainer = "container:TagTunes.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3B76C76E1B909B280025D550"
+            BuildableName = "TagTunes.app"
+            BlueprintName = "TagTunes"
+            ReferencedContainer = "container:TagTunes.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -26,6 +71,16 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3B76C76E1B909B280025D550"
+            BuildableName = "TagTunes.app"
+            BlueprintName = "TagTunes"
+            ReferencedContainer = "container:TagTunes.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -35,6 +90,16 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3B76C76E1B909B280025D550"
+            BuildableName = "TagTunes.app"
+            BlueprintName = "TagTunes"
+            ReferencedContainer = "container:TagTunes.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/TagTunes/Assets.xcassets/PauseProgressFreestandingTemplate.imageset/Contents.json b/TagTunes/Assets.xcassets/PauseProgressFreestandingTemplate.imageset/Contents.json
deleted file mode 100644
index cbee736..0000000
--- a/TagTunes/Assets.xcassets/PauseProgressFreestandingTemplate.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "PauseProgressFreestandingTemplate.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
\ No newline at end of file
diff --git a/TagTunes/Assets.xcassets/PauseProgressFreestandingTemplate.imageset/PauseProgressFreestandingTemplate.pdf b/TagTunes/Assets.xcassets/PauseProgressFreestandingTemplate.imageset/PauseProgressFreestandingTemplate.pdf
deleted file mode 100644
index 72c9322..0000000
--- a/TagTunes/Assets.xcassets/PauseProgressFreestandingTemplate.imageset/PauseProgressFreestandingTemplate.pdf
+++ /dev/null
@@ -1,29 +0,0 @@
-%PDF-1.4
-%����
-1 0 obj <</Filter/FlateDecode/Length 236>>stream
-x�͒1N1E{��'�l''W@���@ۭ`�f��b�>�L���
-EJ���oG��@�$	/.������
�_ �`�w��Gx9���7�����SI[�od�@q�Y%�TC�XԈ�R��f��C�-��J5oT��WY��M;�v�}$
-�G9g�i�n�S}�P#�g�r;���W�C��p3�45�R�֡�2X��񗡿g�ϐKu�5q{�+:�C������~������o�P�K
-endstream
-endobj
-3 0 obj<</Contents 1 0 R/Type/Page/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]>>/Parent 2 0 R/MediaBox[0 0 1024 1024]>>
-endobj
-2 0 obj<</Kids[3 0 R]/Type/Pages/Count 1>>
-endobj
-4 0 obj<</Type/Catalog/Pages 2 0 R>>
-endobj
-5 0 obj<</ModDate(D:20150902100931Z)/Creator(http://www.fileformat.info/convert/image/svg2pdf.htm)/CreationDate(D:20150902100931Z)/Producer(iText1.2.3 by lowagie.com \(based on itext-paulo-152\))>>
-endobj
-xref
-0 6
-0000000000 65535 f 
-0000000015 00000 n 
-0000000458 00000 n 
-0000000318 00000 n 
-0000000508 00000 n 
-0000000552 00000 n 
-trailer
-<</Info 5 0 R/ID [<ae74877cb59949374c065f7f1deb2d92><ae74877cb59949374c065f7f1deb2d92>]/Root 4 0 R/Size 6>>
-startxref
-757
-%%EOF
diff --git a/TagTunes/Assets.xcassets/PreferencesTags.imageset/Contents.json b/TagTunes/Assets.xcassets/PreferencesTags.imageset/Contents.json
deleted file mode 100644
index 67dfe8f..0000000
--- a/TagTunes/Assets.xcassets/PreferencesTags.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "PreferencesTags.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "PreferencesTags-1.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "PreferencesTags-2.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/TagTunes/Assets.xcassets/PreferencesTags.imageset/PreferencesTags-1.png b/TagTunes/Assets.xcassets/PreferencesTags.imageset/PreferencesTags-1.png
deleted file mode 100644
index 2519041..0000000
Binary files a/TagTunes/Assets.xcassets/PreferencesTags.imageset/PreferencesTags-1.png and /dev/null differ
diff --git a/TagTunes/Assets.xcassets/PreferencesTags.imageset/PreferencesTags-2.png b/TagTunes/Assets.xcassets/PreferencesTags.imageset/PreferencesTags-2.png
deleted file mode 100644
index 2519041..0000000
Binary files a/TagTunes/Assets.xcassets/PreferencesTags.imageset/PreferencesTags-2.png and /dev/null differ
diff --git a/TagTunes/Assets.xcassets/PreferencesTags.imageset/PreferencesTags.png b/TagTunes/Assets.xcassets/PreferencesTags.imageset/PreferencesTags.png
deleted file mode 100644
index 2519041..0000000
Binary files a/TagTunes/Assets.xcassets/PreferencesTags.imageset/PreferencesTags.png and /dev/null differ
diff --git a/TagTunes/Assets.xcassets/iTunes.dataset/Contents.json b/TagTunes/Assets.xcassets/iTunes.dataset/Contents.json
deleted file mode 100644
index 6baffea..0000000
--- a/TagTunes/Assets.xcassets/iTunes.dataset/Contents.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "data" : [
-    {
-      "idiom" : "universal"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/TagTunes/Error Handler.swift b/TagTunes/Error Handler.swift
deleted file mode 100644
index 1433b75..0000000
--- a/TagTunes/Error Handler.swift	
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  Error Handler.swift
-//  TagTunes
-//
-//  Created by Kim Wittenburg on 30.08.15.
-//  Copyright © 2015 Kim Wittenburg. All rights reserved.
-//
-
-import Cocoa
-
-class Error_Handler: T {
-
-}