diff --git a/Passepartout-iOS/Scenes/Organizer/AboutViewController.swift b/Passepartout-iOS/Scenes/About/AboutViewController.swift
similarity index 99%
rename from Passepartout-iOS/Scenes/Organizer/AboutViewController.swift
rename to Passepartout-iOS/Scenes/About/AboutViewController.swift
index 7985e0c9..66746ec8 100644
--- a/Passepartout-iOS/Scenes/Organizer/AboutViewController.swift
+++ b/Passepartout-iOS/Scenes/About/AboutViewController.swift
@@ -66,7 +66,7 @@ class AboutViewController: UITableViewController, TableModelHost {
     // MARK: Actions
 
     private func showVersion() {
-        perform(segue: StoryboardSegue.Organizer.versionSegueIdentifier)
+        perform(segue: StoryboardSegue.About.versionSegueIdentifier)
     }
     
     private func visitWebsite() {
diff --git a/Passepartout-iOS/Scenes/Organizer/CreditsViewController.swift b/Passepartout-iOS/Scenes/About/CreditsViewController.swift
similarity index 100%
rename from Passepartout-iOS/Scenes/Organizer/CreditsViewController.swift
rename to Passepartout-iOS/Scenes/About/CreditsViewController.swift
diff --git a/Passepartout-iOS/Scenes/Organizer/LabelViewController.swift b/Passepartout-iOS/Scenes/About/LabelViewController.swift
similarity index 100%
rename from Passepartout-iOS/Scenes/Organizer/LabelViewController.swift
rename to Passepartout-iOS/Scenes/About/LabelViewController.swift
diff --git a/Passepartout-iOS/Scenes/Organizer/VersionViewController.swift b/Passepartout-iOS/Scenes/About/VersionViewController.swift
similarity index 100%
rename from Passepartout-iOS/Scenes/Organizer/VersionViewController.swift
rename to Passepartout-iOS/Scenes/About/VersionViewController.swift
diff --git a/Passepartout-iOS/Scenes/Organizer/ShortcutsAddViewController.swift b/Passepartout-iOS/Scenes/Shortcuts/ShortcutsAddViewController.swift
similarity index 100%
rename from Passepartout-iOS/Scenes/Organizer/ShortcutsAddViewController.swift
rename to Passepartout-iOS/Scenes/Shortcuts/ShortcutsAddViewController.swift
diff --git a/Passepartout-iOS/Scenes/Organizer/ShortcutsConnectToViewController.swift b/Passepartout-iOS/Scenes/Shortcuts/ShortcutsConnectToViewController.swift
similarity index 100%
rename from Passepartout-iOS/Scenes/Organizer/ShortcutsConnectToViewController.swift
rename to Passepartout-iOS/Scenes/Shortcuts/ShortcutsConnectToViewController.swift
diff --git a/Passepartout-iOS/Scenes/Organizer/ShortcutsViewController.swift b/Passepartout-iOS/Scenes/Shortcuts/ShortcutsViewController.swift
similarity index 100%
rename from Passepartout-iOS/Scenes/Organizer/ShortcutsViewController.swift
rename to Passepartout-iOS/Scenes/Shortcuts/ShortcutsViewController.swift
diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj
index bf8d6434..d363ef8b 100644
--- a/Passepartout.xcodeproj/project.pbxproj
+++ b/Passepartout.xcodeproj/project.pbxproj
@@ -340,6 +340,27 @@
 			path = Cells;
 			sourceTree = "<group>";
 		};
+		0E24273D225950CC0064A1A3 /* About */ = {
+			isa = PBXGroup;
+			children = (
+				0EE3BBB1215ED3A900F30952 /* AboutViewController.swift */,
+				0EFBFAC021AC464800887A8C /* CreditsViewController.swift */,
+				0EFD943F215BED8E00529B64 /* LabelViewController.swift */,
+				0E3DA370215CB5BF00B40FC9 /* VersionViewController.swift */,
+			);
+			path = About;
+			sourceTree = "<group>";
+		};
+		0E24273E225950ED0064A1A3 /* Shortcuts */ = {
+			isa = PBXGroup;
+			children = (
+				0E36D24C2240234B006AF062 /* ShortcutsAddViewController.swift */,
+				0E36D25B224034AD006AF062 /* ShortcutsConnectToViewController.swift */,
+				0E773BF7224BF37600CDDC8E /* ShortcutsViewController.swift */,
+			);
+			path = Shortcuts;
+			sourceTree = "<group>";
+		};
 		0E31529C223F9EF500F61841 /* Passepartout-Core */ = {
 			isa = PBXGroup;
 			children = (
@@ -433,15 +454,8 @@
 		0E89DFCC213EEDE700741BA1 /* Organizer */ = {
 			isa = PBXGroup;
 			children = (
-				0EE3BBB1215ED3A900F30952 /* AboutViewController.swift */,
-				0EFBFAC021AC464800887A8C /* CreditsViewController.swift */,
 				0EB67D6A2184581E00BA6200 /* ImportedHostsViewController.swift */,
-				0EFD943F215BED8E00529B64 /* LabelViewController.swift */,
 				0EBE3A78213C4E5400BFA2F5 /* OrganizerViewController.swift */,
-				0E36D24C2240234B006AF062 /* ShortcutsAddViewController.swift */,
-				0E36D25B224034AD006AF062 /* ShortcutsConnectToViewController.swift */,
-				0E773BF7224BF37600CDDC8E /* ShortcutsViewController.swift */,
-				0E3DA370215CB5BF00B40FC9 /* VersionViewController.swift */,
 				0ED38AD8213F33150004D387 /* WizardHostViewController.swift */,
 				0E89DFCD213EEDFA00741BA1 /* WizardProviderViewController.swift */,
 			);
@@ -570,7 +584,9 @@
 		0EDE8DF120C93ED8004C739C /* Scenes */ = {
 			isa = PBXGroup;
 			children = (
+				0E24273D225950CC0064A1A3 /* About */,
 				0E89DFCC213EEDE700741BA1 /* Organizer */,
+				0E24273E225950ED0064A1A3 /* Shortcuts */,
 				0ED31C2820CF2A340027975F /* AccountViewController.swift */,
 				0ED38AEB2141260D0004D387 /* ConfigurationModificationDelegate.swift */,
 				0E1D72B3213C118500BA1586 /* ConfigurationViewController.swift */,
@@ -1112,7 +1128,6 @@
 				0E24273B225950450064A1A3 /* Base */,
 			);
 			name = About.storyboard;
-			path = Base.lproj;
 			sourceTree = "<group>";
 		};
 		0E36D25A22403469006AF062 /* Shortcuts.storyboard */ = {