diff --git a/ZeroTier One.xcodeproj/project.pbxproj b/macui/ZeroTier One.xcodeproj/project.pbxproj
similarity index 100%
rename from ZeroTier One.xcodeproj/project.pbxproj
rename to macui/ZeroTier One.xcodeproj/project.pbxproj
diff --git a/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ZeroTier One/AboutViewController.h b/macui/ZeroTier One/AboutViewController.h
similarity index 100%
rename from ZeroTier One/AboutViewController.h
rename to macui/ZeroTier One/AboutViewController.h
diff --git a/ZeroTier One/AboutViewController.m b/macui/ZeroTier One/AboutViewController.m
similarity index 100%
rename from ZeroTier One/AboutViewController.m
rename to macui/ZeroTier One/AboutViewController.m
diff --git a/ZeroTier One/AboutViewController.xib b/macui/ZeroTier One/AboutViewController.xib
similarity index 100%
rename from ZeroTier One/AboutViewController.xib
rename to macui/ZeroTier One/AboutViewController.xib
diff --git a/ZeroTier One/AppDelegate.h b/macui/ZeroTier One/AppDelegate.h
similarity index 100%
rename from ZeroTier One/AppDelegate.h
rename to macui/ZeroTier One/AppDelegate.h
diff --git a/ZeroTier One/AppDelegate.m b/macui/ZeroTier One/AppDelegate.m
similarity index 100%
rename from ZeroTier One/AppDelegate.m
rename to macui/ZeroTier One/AppDelegate.m
diff --git a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json b/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png b/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png
similarity index 100%
rename from ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png
rename to macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png
diff --git a/ZeroTier One/Assets.xcassets/Contents.json b/macui/ZeroTier One/Assets.xcassets/Contents.json
similarity index 100%
rename from ZeroTier One/Assets.xcassets/Contents.json
rename to macui/ZeroTier One/Assets.xcassets/Contents.json
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
similarity index 100%
rename from ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
rename to macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png
similarity index 100%
rename from ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png
rename to macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png
similarity index 100%
rename from ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png
rename to macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json
similarity index 100%
rename from ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json
rename to macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png
similarity index 100%
rename from ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png
rename to macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png
similarity index 100%
rename from ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png
rename to macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png
diff --git a/ZeroTier One/AuthtokenCopy.h b/macui/ZeroTier One/AuthtokenCopy.h
similarity index 100%
rename from ZeroTier One/AuthtokenCopy.h
rename to macui/ZeroTier One/AuthtokenCopy.h
diff --git a/ZeroTier One/AuthtokenCopy.m b/macui/ZeroTier One/AuthtokenCopy.m
similarity index 100%
rename from ZeroTier One/AuthtokenCopy.m
rename to macui/ZeroTier One/AuthtokenCopy.m
diff --git a/ZeroTier One/Base.lproj/MainMenu.xib b/macui/ZeroTier One/Base.lproj/MainMenu.xib
similarity index 100%
rename from ZeroTier One/Base.lproj/MainMenu.xib
rename to macui/ZeroTier One/Base.lproj/MainMenu.xib
diff --git a/ZeroTier One/Info.plist b/macui/ZeroTier One/Info.plist
similarity index 100%
rename from ZeroTier One/Info.plist
rename to macui/ZeroTier One/Info.plist
diff --git a/ZeroTier One/JoinNetworkViewController.h b/macui/ZeroTier One/JoinNetworkViewController.h
similarity index 100%
rename from ZeroTier One/JoinNetworkViewController.h
rename to macui/ZeroTier One/JoinNetworkViewController.h
diff --git a/ZeroTier One/JoinNetworkViewController.m b/macui/ZeroTier One/JoinNetworkViewController.m
similarity index 100%
rename from ZeroTier One/JoinNetworkViewController.m
rename to macui/ZeroTier One/JoinNetworkViewController.m
diff --git a/ZeroTier One/JoinNetworkViewController.xib b/macui/ZeroTier One/JoinNetworkViewController.xib
similarity index 100%
rename from ZeroTier One/JoinNetworkViewController.xib
rename to macui/ZeroTier One/JoinNetworkViewController.xib
diff --git a/ZeroTier One/Network.h b/macui/ZeroTier One/Network.h
similarity index 100%
rename from ZeroTier One/Network.h
rename to macui/ZeroTier One/Network.h
diff --git a/ZeroTier One/Network.m b/macui/ZeroTier One/Network.m
similarity index 100%
rename from ZeroTier One/Network.m
rename to macui/ZeroTier One/Network.m
diff --git a/ZeroTier One/NetworkInfoCell.h b/macui/ZeroTier One/NetworkInfoCell.h
similarity index 100%
rename from ZeroTier One/NetworkInfoCell.h
rename to macui/ZeroTier One/NetworkInfoCell.h
diff --git a/ZeroTier One/NetworkInfoCell.m b/macui/ZeroTier One/NetworkInfoCell.m
similarity index 100%
rename from ZeroTier One/NetworkInfoCell.m
rename to macui/ZeroTier One/NetworkInfoCell.m
diff --git a/ZeroTier One/NetworkMonitor.h b/macui/ZeroTier One/NetworkMonitor.h
similarity index 100%
rename from ZeroTier One/NetworkMonitor.h
rename to macui/ZeroTier One/NetworkMonitor.h
diff --git a/ZeroTier One/NetworkMonitor.m b/macui/ZeroTier One/NetworkMonitor.m
similarity index 100%
rename from ZeroTier One/NetworkMonitor.m
rename to macui/ZeroTier One/NetworkMonitor.m
diff --git a/ZeroTier One/NodeStatus.h b/macui/ZeroTier One/NodeStatus.h
similarity index 100%
rename from ZeroTier One/NodeStatus.h
rename to macui/ZeroTier One/NodeStatus.h
diff --git a/ZeroTier One/NodeStatus.m b/macui/ZeroTier One/NodeStatus.m
similarity index 100%
rename from ZeroTier One/NodeStatus.m
rename to macui/ZeroTier One/NodeStatus.m
diff --git a/ZeroTier One/PreferencesViewController.h b/macui/ZeroTier One/PreferencesViewController.h
similarity index 100%
rename from ZeroTier One/PreferencesViewController.h
rename to macui/ZeroTier One/PreferencesViewController.h
diff --git a/ZeroTier One/PreferencesViewController.m b/macui/ZeroTier One/PreferencesViewController.m
similarity index 100%
rename from ZeroTier One/PreferencesViewController.m
rename to macui/ZeroTier One/PreferencesViewController.m
diff --git a/ZeroTier One/PreferencesViewController.xib b/macui/ZeroTier One/PreferencesViewController.xib
similarity index 100%
rename from ZeroTier One/PreferencesViewController.xib
rename to macui/ZeroTier One/PreferencesViewController.xib
diff --git a/ZeroTier One/ServiceCom.h b/macui/ZeroTier One/ServiceCom.h
similarity index 100%
rename from ZeroTier One/ServiceCom.h
rename to macui/ZeroTier One/ServiceCom.h
diff --git a/ZeroTier One/ServiceCom.m b/macui/ZeroTier One/ServiceCom.m
similarity index 100%
rename from ZeroTier One/ServiceCom.m
rename to macui/ZeroTier One/ServiceCom.m
diff --git a/ZeroTier One/ShowNetworksViewController.h b/macui/ZeroTier One/ShowNetworksViewController.h
similarity index 100%
rename from ZeroTier One/ShowNetworksViewController.h
rename to macui/ZeroTier One/ShowNetworksViewController.h
diff --git a/ZeroTier One/ShowNetworksViewController.m b/macui/ZeroTier One/ShowNetworksViewController.m
similarity index 100%
rename from ZeroTier One/ShowNetworksViewController.m
rename to macui/ZeroTier One/ShowNetworksViewController.m
diff --git a/ZeroTier One/ShowNetworksViewController.xib b/macui/ZeroTier One/ShowNetworksViewController.xib
similarity index 100%
rename from ZeroTier One/ShowNetworksViewController.xib
rename to macui/ZeroTier One/ShowNetworksViewController.xib
diff --git a/ZeroTier One/ZeroTierIcon.icns b/macui/ZeroTier One/ZeroTierIcon.icns
similarity index 100%
rename from ZeroTier One/ZeroTierIcon.icns
rename to macui/ZeroTier One/ZeroTierIcon.icns
diff --git a/ZeroTier One/about.html b/macui/ZeroTier One/about.html
similarity index 100%
rename from ZeroTier One/about.html
rename to macui/ZeroTier One/about.html
diff --git a/ZeroTier One/main.m b/macui/ZeroTier One/main.m
similarity index 100%
rename from ZeroTier One/main.m
rename to macui/ZeroTier One/main.m