diff --git a/punchnet/Views/AppContext.swift b/punchnet/App/AppContext.swift
similarity index 100%
rename from punchnet/Views/AppContext.swift
rename to punchnet/App/AppContext.swift
diff --git a/punchnet/Views/AppRootView.swift b/punchnet/App/AppRootView.swift
similarity index 100%
rename from punchnet/Views/AppRootView.swift
rename to punchnet/App/AppRootView.swift
diff --git a/punchnet/punchnetApp.swift b/punchnet/App/punchnetApp.swift
similarity index 100%
rename from punchnet/punchnetApp.swift
rename to punchnet/App/punchnetApp.swift
diff --git a/punchnet/Views/Register/RegisterModel.swift b/punchnet/Features/Auth/ViewModels/RegisterModel.swift
similarity index 100%
rename from punchnet/Views/Register/RegisterModel.swift
rename to punchnet/Features/Auth/ViewModels/RegisterModel.swift
diff --git a/punchnet/Views/ResetPassword/ResetPasswordModel.swift b/punchnet/Features/Auth/ViewModels/ResetPasswordModel.swift
similarity index 100%
rename from punchnet/Views/ResetPassword/ResetPasswordModel.swift
rename to punchnet/Features/Auth/ViewModels/ResetPasswordModel.swift
diff --git a/punchnet/Views/Login/LoginView.swift b/punchnet/Features/Auth/Views/LoginView.swift
similarity index 100%
rename from punchnet/Views/Login/LoginView.swift
rename to punchnet/Features/Auth/Views/LoginView.swift
diff --git a/punchnet/Views/Register/RegisterView.swift b/punchnet/Features/Auth/Views/RegisterView.swift
similarity index 100%
rename from punchnet/Views/Register/RegisterView.swift
rename to punchnet/Features/Auth/Views/RegisterView.swift
diff --git a/punchnet/Views/ResetPassword/ResetPasswordView.swift b/punchnet/Features/Auth/Views/ResetPasswordView.swift
similarity index 100%
rename from punchnet/Views/ResetPassword/ResetPasswordView.swift
rename to punchnet/Features/Auth/Views/ResetPasswordView.swift
diff --git a/punchnet/Views/MenuBar/MainMenuBar.swift b/punchnet/Features/MenuBar/Views/MainMenuBar.swift
similarity index 100%
rename from punchnet/Views/MenuBar/MainMenuBar.swift
rename to punchnet/Features/MenuBar/Views/MainMenuBar.swift
diff --git a/punchnet/Views/Network/NetworkMenuView.swift b/punchnet/Features/Network/Views/NetworkMenuView.swift
similarity index 100%
rename from punchnet/Views/Network/NetworkMenuView.swift
rename to punchnet/Features/Network/Views/NetworkMenuView.swift
diff --git a/punchnet/Views/Network/NetworkView.swift b/punchnet/Features/Network/Views/NetworkView.swift
similarity index 100%
rename from punchnet/Views/Network/NetworkView.swift
rename to punchnet/Features/Network/Views/NetworkView.swift
diff --git a/punchnet/Views/Privacy/PrivacyDetailView.swift b/punchnet/Features/Privacy/Views/PrivacyDetailView.swift
similarity index 100%
rename from punchnet/Views/Privacy/PrivacyDetailView.swift
rename to punchnet/Features/Privacy/Views/PrivacyDetailView.swift
diff --git a/punchnet/Views/Privacy/PunchNetWebView.swift b/punchnet/Features/Privacy/Views/PunchNetWebView.swift
similarity index 100%
rename from punchnet/Views/Privacy/PunchNetWebView.swift
rename to punchnet/Features/Privacy/Views/PunchNetWebView.swift
diff --git a/punchnet/Views/Settings/SettingsAboutView.swift b/punchnet/Features/Settings/Views/SettingsAboutView.swift
similarity index 100%
rename from punchnet/Views/Settings/SettingsAboutView.swift
rename to punchnet/Features/Settings/Views/SettingsAboutView.swift
diff --git a/punchnet/Views/Settings/SettingsAccountView.swift b/punchnet/Features/Settings/Views/SettingsAccountView.swift
similarity index 100%
rename from punchnet/Views/Settings/SettingsAccountView.swift
rename to punchnet/Features/Settings/Views/SettingsAccountView.swift
diff --git a/punchnet/Views/Settings/SettingsDeviceView.swift b/punchnet/Features/Settings/Views/SettingsDeviceView.swift
similarity index 100%
rename from punchnet/Views/Settings/SettingsDeviceView.swift
rename to punchnet/Features/Settings/Views/SettingsDeviceView.swift
diff --git a/punchnet/Views/Settings/SettingsNetworkView.swift b/punchnet/Features/Settings/Views/SettingsNetworkView.swift
similarity index 100%
rename from punchnet/Views/Settings/SettingsNetworkView.swift
rename to punchnet/Features/Settings/Views/SettingsNetworkView.swift
diff --git a/punchnet/Views/Settings/SettingsSystemView.swift b/punchnet/Features/Settings/Views/SettingsSystemView.swift
similarity index 100%
rename from punchnet/Views/Settings/SettingsSystemView.swift
rename to punchnet/Features/Settings/Views/SettingsSystemView.swift
diff --git a/punchnet/Views/Settings/SettingsUserIssueView.swift b/punchnet/Features/Settings/Views/SettingsUserIssueView.swift
similarity index 100%
rename from punchnet/Views/Settings/SettingsUserIssueView.swift
rename to punchnet/Features/Settings/Views/SettingsUserIssueView.swift
diff --git a/punchnet/Views/Settings/SettingsView.swift b/punchnet/Features/Settings/Views/SettingsView.swift
similarity index 100%
rename from punchnet/Views/Settings/SettingsView.swift
rename to punchnet/Features/Settings/Views/SettingsView.swift
diff --git a/punchnet/Views/Update/AppUpdateManager.swift b/punchnet/Features/Upgrade/ViewModels/AppUpdateManager.swift
similarity index 100%
rename from punchnet/Views/Update/AppUpdateManager.swift
rename to punchnet/Features/Upgrade/ViewModels/AppUpdateManager.swift
diff --git a/punchnet/Views/Update/AppUpdateView.swift b/punchnet/Features/Upgrade/Views/AppUpdateView.swift
similarity index 100%
rename from punchnet/Views/Update/AppUpdateView.swift
rename to punchnet/Features/Upgrade/Views/AppUpdateView.swift
diff --git a/punchnet/Networking/SDLAPIClient+App.swift b/punchnet/Shared/Networking/SDLAPIClient+App.swift
similarity index 100%
rename from punchnet/Networking/SDLAPIClient+App.swift
rename to punchnet/Shared/Networking/SDLAPIClient+App.swift
diff --git a/punchnet/Networking/SDLAPIClient+Network.swift b/punchnet/Shared/Networking/SDLAPIClient+Network.swift
similarity index 100%
rename from punchnet/Networking/SDLAPIClient+Network.swift
rename to punchnet/Shared/Networking/SDLAPIClient+Network.swift
diff --git a/punchnet/Networking/SDLAPIClient+User.swift b/punchnet/Shared/Networking/SDLAPIClient+User.swift
similarity index 100%
rename from punchnet/Networking/SDLAPIClient+User.swift
rename to punchnet/Shared/Networking/SDLAPIClient+User.swift
diff --git a/punchnet/Networking/SDLAPIClient.swift b/punchnet/Shared/Networking/SDLAPIClient.swift
similarity index 100%
rename from punchnet/Networking/SDLAPIClient.swift
rename to punchnet/Shared/Networking/SDLAPIClient.swift
diff --git a/punchnet/Views/Common/CustomWindowControls.swift b/punchnet/Shared/SwiftUI/CustomWindowControls.swift
similarity index 100%
rename from punchnet/Views/Common/CustomWindowControls.swift
rename to punchnet/Shared/SwiftUI/CustomWindowControls.swift
diff --git a/punchnet/Views/Common/VisualEffectView.swift b/punchnet/Shared/SwiftUI/VisualEffectView.swift
similarity index 100%
rename from punchnet/Views/Common/VisualEffectView.swift
rename to punchnet/Shared/SwiftUI/VisualEffectView.swift