diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/Coordinator/LocationSharingCoordinator.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/Coordinator/LocationSharingCoordinator.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/Coordinator/ShareLocationActivityController.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/ShareLocationActivityController.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/Coordinator/ShareLocationActivityController.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/ShareLocationActivityController.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/Coordinator/ShareToMapsAppActivity.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/ShareToMapsAppActivity.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/Coordinator/ShareToMapsAppActivity.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Coordinator/ShareToMapsAppActivity.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/LocationAnnotation.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/LocationAnnotation.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/LocationAnnotation.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/LocationAnnotation.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/LocationSharingModels.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/LocationSharingModels.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/LocationSharingModels.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/LocationSharingModels.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/LocationSharingScreenState.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/LocationSharingScreenState.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/LocationSharingScreenState.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/LocationSharingScreenState.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/LocationSharingViewModel.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/LocationSharingViewModel.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/LocationSharingViewModel.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/LocationSharingViewModel.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/LocationSharingViewModelProtocol.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/LocationSharingViewModelProtocol.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/LocationSharingViewModelProtocol.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/LocationSharingViewModelProtocol.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/MapCreditsActionSheet.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/MapCreditsActionSheet.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/MapCreditsActionSheet.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/MapCreditsActionSheet.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/MapViewErrorAlertInfoBuilder.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/MapViewErrorAlertInfoBuilder.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/MapViewErrorAlertInfoBuilder.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/MapViewErrorAlertInfoBuilder.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/Service/LocationAuthorizationStatus.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Service/LocationAuthorizationStatus.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/Service/LocationAuthorizationStatus.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Service/LocationAuthorizationStatus.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/Service/LocationSharingServiceProtocol.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Service/LocationSharingServiceProtocol.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/Service/LocationSharingServiceProtocol.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Service/LocationSharingServiceProtocol.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/Service/MatrixSDK/LocationSharingService.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Service/MatrixSDK/LocationSharingService.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/Service/MatrixSDK/LocationSharingService.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Service/MatrixSDK/LocationSharingService.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/Service/Mock/MockLocationSharingService.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Service/Mock/MockLocationSharingService.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/Service/Mock/MockLocationSharingService.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Service/Mock/MockLocationSharingService.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/Test/UI/LocationSharingUITests.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Test/UI/LocationSharingUITests.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/Test/UI/LocationSharingUITests.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Test/UI/LocationSharingUITests.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/Test/Unit/LocationSharingViewModelTests.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Test/Unit/LocationSharingViewModelTests.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/Test/Unit/LocationSharingViewModelTests.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/Test/Unit/LocationSharingViewModelTests.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/LocationSharingMapView.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/LocationSharingMapView.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/LocationSharingMapView.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/LocationSharingMapView.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/LocationSharingMarkerView.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/LocationSharingMarkerView.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/LocationSharingMarkerView.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/LocationSharingMarkerView.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/LocationSharingOptionButton.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/LocationSharingOptionButton.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/LocationSharingOptionButton.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/LocationSharingOptionButton.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/LocationSharingView.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/LocationSharingView.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/LocationSharingView.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/LocationSharingView.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/MapCreditsView.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/MapCreditsView.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/MapCreditsView.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/MapCreditsView.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/MapLoadingErrorView.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/MapLoadingErrorView.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/MapLoadingErrorView.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/MapLoadingErrorView.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/UserAnnotationCalloutContentView.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/UserAnnotationCalloutContentView.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/UserAnnotationCalloutContentView.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/UserAnnotationCalloutContentView.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/UserAnnotationCalloutContentView.xib b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/UserAnnotationCalloutContentView.xib
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/UserAnnotationCalloutContentView.xib
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/UserAnnotationCalloutContentView.xib
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/UserAnnotationCalloutView.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/UserAnnotationCalloutView.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/UserAnnotationCalloutView.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/UserAnnotationCalloutView.swift
diff --git a/RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/UserLocationAnnotationView.swift b/RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/UserLocationAnnotationView.swift
similarity index 100%
rename from RiotSwiftUI/Modules/LocationSharing/LocationSharing/View/UserLocationAnnotationView.swift
rename to RiotSwiftUI/Modules/LocationSharing/StartLocationSharing/View/UserLocationAnnotationView.swift