diff --git a/.gitignore b/.gitignore
index a83f49e72b..2b407c2491 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,8 +121,6 @@ wiiu/wut/elf2rpl/elf2rpl
 /media/libretrodb/
 
 pkg/apple/iOS/build/
-pkg/apple/iOS/modules/
-pkg/apple/tvOS/modules/
 pkg/apple/build/
 ui/drivers/qt/moc_*
 ui/drivers/moc_*
diff --git a/pkg/apple/RetroArch_iOS11.xcodeproj/xcshareddata/xcschemes/RetroArch iOS Release.xcscheme b/pkg/apple/RetroArch_iOS11.xcodeproj/xcshareddata/xcschemes/RetroArch iOS Release.xcscheme
new file mode 100644
index 0000000000..54573fab59
--- /dev/null
+++ b/pkg/apple/RetroArch_iOS11.xcodeproj/xcshareddata/xcschemes/RetroArch iOS Release.xcscheme	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9204BE091D319EF300BD49DB"
+               BuildableName = "RetroArchiOS11.app"
+               BlueprintName = "RetroArchiOS11"
+               ReferencedContainer = "container:RetroArch_iOS11.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9204BE091D319EF300BD49DB"
+            BuildableName = "RetroArchiOS11.app"
+            BlueprintName = "RetroArchiOS11"
+            ReferencedContainer = "container:RetroArch_iOS11.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9204BE091D319EF300BD49DB"
+            BuildableName = "RetroArchiOS11.app"
+            BlueprintName = "RetroArchiOS11"
+            ReferencedContainer = "container:RetroArch_iOS11.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9204BE091D319EF300BD49DB"
+            BuildableName = "RetroArchiOS11.app"
+            BlueprintName = "RetroArchiOS11"
+            ReferencedContainer = "container:RetroArch_iOS11.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/pkg/apple/RetroArch_iOS11.xcodeproj/xcshareddata/xcschemes/RetroArch tvOS.xcscheme b/pkg/apple/RetroArch_iOS11.xcodeproj/xcshareddata/xcschemes/RetroArch tvOS Debug.xcscheme
similarity index 100%
rename from pkg/apple/RetroArch_iOS11.xcodeproj/xcshareddata/xcschemes/RetroArch tvOS.xcscheme
rename to pkg/apple/RetroArch_iOS11.xcodeproj/xcshareddata/xcschemes/RetroArch tvOS Debug.xcscheme
diff --git a/pkg/apple/RetroArch_iOS11.xcodeproj/xcshareddata/xcschemes/RetroArch tvOS Release.xcscheme b/pkg/apple/RetroArch_iOS11.xcodeproj/xcshareddata/xcschemes/RetroArch tvOS Release.xcscheme
new file mode 100644
index 0000000000..555415136f
--- /dev/null
+++ b/pkg/apple/RetroArch_iOS11.xcodeproj/xcshareddata/xcschemes/RetroArch tvOS Release.xcscheme	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "926C77D621FD1E6500103EDE"
+               BuildableName = "RetroArchTV.app"
+               BlueprintName = "RetroArchTV"
+               ReferencedContainer = "container:RetroArch_iOS11.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "926C77D621FD1E6500103EDE"
+            BuildableName = "RetroArchTV.app"
+            BlueprintName = "RetroArchTV"
+            ReferencedContainer = "container:RetroArch_iOS11.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "926C77D621FD1E6500103EDE"
+            BuildableName = "RetroArchTV.app"
+            BlueprintName = "RetroArchTV"
+            ReferencedContainer = "container:RetroArch_iOS11.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "926C77D621FD1E6500103EDE"
+            BuildableName = "RetroArchTV.app"
+            BlueprintName = "RetroArchTV"
+            ReferencedContainer = "container:RetroArch_iOS11.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/pkg/apple/iOS/modules/.gitignore b/pkg/apple/iOS/modules/.gitignore
new file mode 100644
index 0000000000..5e7d2734cf
--- /dev/null
+++ b/pkg/apple/iOS/modules/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/pkg/apple/tvOS/modules/.gitignore b/pkg/apple/tvOS/modules/.gitignore
new file mode 100644
index 0000000000..5e7d2734cf
--- /dev/null
+++ b/pkg/apple/tvOS/modules/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore