diff --git a/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationScreen.kt b/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationScreen.kt
index 148aa4bc..53b74b02 100644
--- a/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationScreen.kt
+++ b/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationScreen.kt
@@ -1,12 +1,6 @@
 @file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 
 package at.mocode.frontend.features.device.initialization.presentation
-import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
-import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
-import at.mocode.frontend.features.device.initialization.domain.model.ExpectedClient
-
-
-
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
diff --git a/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationUiState.kt b/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationUiState.kt
index 542a6aa8..f6e2c072 100644
--- a/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationUiState.kt
+++ b/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationUiState.kt
@@ -1,14 +1,9 @@
 @file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 
 package at.mocode.frontend.features.device.initialization.presentation
-import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
-import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
-import at.mocode.frontend.features.device.initialization.domain.model.ExpectedClient
-
-
-
 
 import at.mocode.frontend.core.network.discovery.DiscoveredService
+import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
 
 data class DeviceInitializationUiState(
   val currentStep: Int = 0,
diff --git a/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/NetworkRoleSelector.kt b/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/NetworkRoleSelector.kt
index 6abc96e2..a8d95d99 100644
--- a/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/NetworkRoleSelector.kt
+++ b/frontend/features/device-initialization/src/commonMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/NetworkRoleSelector.kt
@@ -1,12 +1,6 @@
 @file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 
 package at.mocode.frontend.features.device.initialization.presentation
-import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
-import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
-import at.mocode.frontend.features.device.initialization.domain.model.ExpectedClient
-
-
-
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.MaterialTheme
@@ -18,6 +12,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.key.*
 import androidx.compose.ui.unit.dp
+import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
 
 @Composable
 fun NetworkRoleSelector(
diff --git a/frontend/features/device-initialization/src/jvmMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationConfig.jvm.kt b/frontend/features/device-initialization/src/jvmMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationConfig.jvm.kt
index 1aba23fa..3ec80ae2 100644
--- a/frontend/features/device-initialization/src/jvmMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationConfig.jvm.kt
+++ b/frontend/features/device-initialization/src/jvmMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationConfig.jvm.kt
@@ -1,12 +1,6 @@
 @file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 
 package at.mocode.frontend.features.device.initialization.presentation
-import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
-import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
-import at.mocode.frontend.features.device.initialization.domain.model.ExpectedClient
-
-
-
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.KeyboardActions
@@ -38,6 +32,7 @@ import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 import at.mocode.frontend.core.designsystem.components.MsEnumDropdown
 import at.mocode.frontend.features.device.initialization.domain.DeviceInitializationValidator
+import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
 import java.io.File
 import javax.swing.JFileChooser
 import javax.swing.UIManager
diff --git a/frontend/features/device-initialization/src/wasmJsMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationConfig.wasmJs.kt b/frontend/features/device-initialization/src/wasmJsMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationConfig.wasmJs.kt
index 88cebe8e..6e2f60d3 100644
--- a/frontend/features/device-initialization/src/wasmJsMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationConfig.wasmJs.kt
+++ b/frontend/features/device-initialization/src/wasmJsMain/kotlin/at/mocode/frontend/features/device/initialization/presentation/DeviceInitializationConfig.wasmJs.kt
@@ -1,12 +1,6 @@
 @file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 
 package at.mocode.frontend.features.device.initialization.presentation
-import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
-import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
-import at.mocode.frontend.features.device.initialization.domain.model.ExpectedClient
-
-
-
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column