diff --git a/ext/mac-ui-macgap1-wrapper/LICENSE b/ext/mac-ui-macgap1-wrapper/src/LICENSE
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/LICENSE
rename to ext/mac-ui-macgap1-wrapper/src/LICENSE
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.pbxproj b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.pbxproj
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.pbxproj
rename to ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.pbxproj
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout
rename to ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/Alex.xcuserdatad/UserInterfaceState.xcuserstate b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/Alex.xcuserdatad/UserInterfaceState.xcuserstate
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/Alex.xcuserdatad/UserInterfaceState.xcuserstate
rename to ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/Alex.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/api.xcuserdatad/WorkspaceSettings.xcsettings b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/api.xcuserdatad/WorkspaceSettings.xcsettings
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/api.xcuserdatad/WorkspaceSettings.xcsettings
rename to ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/api.xcuserdatad/WorkspaceSettings.xcsettings
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/UserInterfaceState.xcuserstate b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/UserInterfaceState.xcuserstate
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/UserInterfaceState.xcuserstate
rename to ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/WorkspaceSettings.xcsettings b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/WorkspaceSettings.xcsettings
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/WorkspaceSettings.xcsettings
rename to ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/WorkspaceSettings.xcsettings
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/AppDelegate.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/AppDelegate.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/AppDelegate.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/AppDelegate.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/AppDelegate.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/AppDelegate.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/AppDelegate.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/AppDelegate.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/CallbackDelegate.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/CallbackDelegate.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/CallbackDelegate.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/CallbackDelegate.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/CallbackDelegate.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/CallbackDelegate.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/CallbackDelegate.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/CallbackDelegate.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/App.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/App.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/App.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/App.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/App.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/App.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/App.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/App.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Command.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Command.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Command.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Command.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Command.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Command.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Command.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Command.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Dock.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Dock.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Dock.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Dock.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Dock.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Dock.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Dock.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Dock.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/MenuItemProxy.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuItemProxy.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/MenuItemProxy.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuItemProxy.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/MenuItemProxy.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuItemProxy.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/MenuItemProxy.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuItemProxy.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/MenuProxy.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuProxy.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/MenuProxy.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuProxy.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/MenuProxy.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuProxy.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/MenuProxy.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuProxy.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Notice.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Notice.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Notice.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Notice.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Notice.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Notice.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Notice.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Notice.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Path.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Path.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Path.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Path.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Path.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Path.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Path.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Path.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Sound.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Sound.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Sound.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Sound.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Sound.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Sound.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/Sound.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Sound.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/UserDefaults.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/UserDefaults.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/UserDefaults.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/UserDefaults.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/UserDefaults.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/UserDefaults.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/UserDefaults.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/UserDefaults.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/fonts.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/fonts.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/fonts.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/fonts.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/fonts.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/fonts.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Commands/fonts.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/fonts.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Constants.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Constants.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Constants.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Constants.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/ContentView.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/ContentView.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/ContentView.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/ContentView.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/ContentView.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/ContentView.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/ContentView.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/ContentView.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/JSEventHelper.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/JSEventHelper.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/JSEventHelper.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/JSEventHelper.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/JSEventHelper.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/JSEventHelper.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/JSEventHelper.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/JSEventHelper.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Utils.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Utils.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Utils.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Utils.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Utils.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Utils.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Utils.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Utils.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/WebViewDelegate.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/WebViewDelegate.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/WebViewDelegate.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/WebViewDelegate.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/WebViewDelegate.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/WebViewDelegate.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/WebViewDelegate.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/WebViewDelegate.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Window.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Window.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Window.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Window.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Classes/Window.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Window.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Classes/Window.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Window.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Clipboard.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Clipboard.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Clipboard.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Clipboard.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Clipboard.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Clipboard.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Clipboard.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Clipboard.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/Contents.json b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/Contents.json
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/application128x128.png b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application128x128.png
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/application128x128.png
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application128x128.png
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/application16x16.png b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application16x16.png
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/application16x16.png
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application16x16.png
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/application256x256.png b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application256x256.png
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/application256x256.png
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application256x256.png
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/application32x32.png b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application32x32.png
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/application32x32.png
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application32x32.png
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/application512x512.png b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application512x512.png
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/Images.xcassets/AppIcon.appiconset/application512x512.png
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application512x512.png
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/MacGap-Info.plist b/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Info.plist
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/MacGap-Info.plist
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Info.plist
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/MacGap-Prefix.pch b/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Prefix.pch
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/MacGap-Prefix.pch
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Prefix.pch
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/WindowController.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/WindowController.h
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/WindowController.h
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/WindowController.h
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/WindowController.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/WindowController.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/WindowController.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/WindowController.m
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/en.lproj/Credits.rtf b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Credits.rtf
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/en.lproj/Credits.rtf
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Credits.rtf
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/en.lproj/InfoPlist.strings b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/InfoPlist.strings
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/en.lproj/InfoPlist.strings
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/InfoPlist.strings
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/en.lproj/MainMenu.xib b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/MainMenu.xib
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/en.lproj/MainMenu.xib
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/MainMenu.xib
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/en.lproj/Window.xib b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Window.xib
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/en.lproj/Window.xib
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Window.xib
diff --git a/ext/mac-ui-macgap1-wrapper/MacGap/main.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/main.m
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/MacGap/main.m
rename to ext/mac-ui-macgap1-wrapper/src/MacGap/main.m
diff --git a/ext/mac-ui-macgap1-wrapper/README.md b/ext/mac-ui-macgap1-wrapper/src/README.md
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/README.md
rename to ext/mac-ui-macgap1-wrapper/src/README.md
diff --git a/ext/mac-ui-macgap1-wrapper/application.icns b/ext/mac-ui-macgap1-wrapper/src/application.icns
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/application.icns
rename to ext/mac-ui-macgap1-wrapper/src/application.icns
diff --git a/ext/mac-ui-macgap1-wrapper/public/index.html b/ext/mac-ui-macgap1-wrapper/src/public/index.html
similarity index 100%
rename from ext/mac-ui-macgap1-wrapper/public/index.html
rename to ext/mac-ui-macgap1-wrapper/src/public/index.html