diff --git a/.idea/.name b/.idea/.name
index 4f401f6..802fda2 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Simple login
\ No newline at end of file
+SimpleLogin
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 354c0b2..6543030 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 0fc3113..c22b6fa 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.10" />
+    <option name="version" value="2.1.10" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 391ad94..a8cf6ba 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,10 +3,10 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cee6101..2131be7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11
 
 plugins {
     alias(libs.plugins.kotlinAndroid)
@@ -7,17 +7,17 @@ plugins {
 
 kotlin {
     compilerOptions {
-        jvmTarget = JVM_1_8
+        jvmTarget = JVM_11
     }
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.jetbrains.simplelogin.androidapp"
-        minSdk = 21
-        targetSdk = 34
+        minSdk = 24
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 
@@ -34,8 +34,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     buildFeatures {
         viewBinding = true
@@ -44,7 +44,6 @@ android {
 }
 
 dependencies {
-    implementation(projects.shared)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.material)
@@ -52,6 +51,7 @@ dependencies {
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.lifecycle.livedata.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(project(":shared"))
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.test.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModel.kt b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModel.kt
index 2ae95c1..b101af1 100644
--- a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModel.kt
@@ -3,11 +3,11 @@ package com.jetbrains.simplelogin.androidapp.ui.login
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.jetbrains.simplelogin.shared.LoginRepository
-import com.jetbrains.simplelogin.shared.Result
+import com.jetbrains.simplelogin.shared.data.LoginRepository
+import com.jetbrains.simplelogin.shared.data.Result
 
 import com.jetbrains.simplelogin.androidapp.R
-import com.jetbrains.simplelogin.shared.LoginDataValidator
+import com.jetbrains.simplelogin.shared.data.LoginDataValidator
 
 class LoginViewModel(private val loginRepository: LoginRepository, private val dataValidator: LoginDataValidator) : ViewModel() {
 
diff --git a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModelFactory.kt b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModelFactory.kt
index a6cea16..f5b3e0d 100644
--- a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModelFactory.kt
+++ b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModelFactory.kt
@@ -2,9 +2,9 @@ package com.jetbrains.simplelogin.androidapp.ui.login
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.jetbrains.simplelogin.shared.LoginDataSource
-import com.jetbrains.simplelogin.shared.LoginDataValidator
-import com.jetbrains.simplelogin.shared.LoginRepository
+import com.jetbrains.simplelogin.shared.data.LoginDataSource
+import com.jetbrains.simplelogin.shared.data.LoginDataValidator
+import com.jetbrains.simplelogin.shared.data.LoginRepository
 
 /**
  * ViewModel provider factory to instantiate LoginViewModel.
diff --git a/build.gradle.kts b/build.gradle.kts
index 8a20438..cafd04c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.kotlinAndroid) apply false
-    alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
+    alias(libs.plugins.android.kotlin.multiplatform.library) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d0a7ce2..088043f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,25 +1,28 @@
 [versions]
-android-gradlePlugin = "8.2.2"
-android-compileSdk = "34"
+android-gradlePlugin = "8.8.2"
+android-compileSdk = "35"
 android-minSdk = "24"
-android-targetSdk = "34"
-androidx-activityCompose = "1.9.0"
+android-targetSdk = "35"
+androidx-activityCompose = "1.10.1"
 androidx-appcompat = "1.7.0"
-androidx-constraintlayout = "2.1.4"
-androidx-core-ktx = "1.13.1"
+androidx-constraintlayout = "2.2.1"
+androidx-core-ktx = "1.15.0"
 androidx-espresso-core = "3.6.1"
 androidx-material = "1.12.0"
 androidx-test-junit = "1.2.1"
-annotation = "1.8.0"
-compose = "1.6.8"
+annotation = "1.9.1"
+compose = "1.7.8"
 compose-plugin = "1.6.10"
 imageLoader = "1.6.3"
 junit = "4.13.2"
-kotlin = "2.0.20"
-kotlinxCoroutinesCore = "1.8.0"
-ktor = "2.3.7"
-lifecycleLivedataKtx = "2.8.2"
+kotlin = "2.1.10"
+kotlinxCoroutinesCore = "1.10.1"
+ktor = "3.1.0"
+lifecycleLivedataKtx = "2.8.7"
 voyagerNavigator = "1.0.0"
+kotlinStdlib = "2.1.10"
+runner = "1.5.2"
+core = "1.5.0"
 
 [libraries]
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
@@ -44,6 +47,9 @@ ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
 voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyagerNavigator" }
 ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlinStdlib" }
+androidx-runner = { group = "androidx.test", name = "runner", version.ref = "runner" }
+androidx-core = { group = "androidx.test", name = "core", version.ref = "core" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "android-gradlePlugin" }
@@ -52,3 +58,4 @@ jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "android-gradlePlugin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 09523c0..df97d72 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/iosApp/simpleLoginIOS.xcodeproj/project.pbxproj b/iosApp/simpleLoginIOS.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..f3ec1aa
--- /dev/null
+++ b/iosApp/simpleLoginIOS.xcodeproj/project.pbxproj
@@ -0,0 +1,584 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 77;
+	objects = {
+
+/* Begin PBXContainerItemProxy section */
+		6615EC162D77133E009EEC33 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6615EBFD2D77133C009EEC33 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 6615EC042D77133C009EEC33;
+			remoteInfo = simpleLoginIOS;
+		};
+		6615EC202D77133F009EEC33 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6615EBFD2D77133C009EEC33 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 6615EC042D77133C009EEC33;
+			remoteInfo = simpleLoginIOS;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		6615EC052D77133C009EEC33 /* simpleLoginIOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = simpleLoginIOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		6615EC152D77133E009EEC33 /* simpleLoginIOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = simpleLoginIOSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		6615EC1F2D77133F009EEC33 /* simpleLoginIOSUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = simpleLoginIOSUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFileSystemSynchronizedRootGroup section */
+		6615EC072D77133C009EEC33 /* simpleLoginIOS */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			path = simpleLoginIOS;
+			sourceTree = "<group>";
+		};
+		6615EC182D77133E009EEC33 /* simpleLoginIOSTests */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			path = simpleLoginIOSTests;
+			sourceTree = "<group>";
+		};
+		6615EC222D77133F009EEC33 /* simpleLoginIOSUITests */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			path = simpleLoginIOSUITests;
+			sourceTree = "<group>";
+		};
+/* End PBXFileSystemSynchronizedRootGroup section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		6615EC022D77133C009EEC33 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6615EC122D77133E009EEC33 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6615EC1C2D77133F009EEC33 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		6615EBFC2D77133C009EEC33 = {
+			isa = PBXGroup;
+			children = (
+				6615EC072D77133C009EEC33 /* simpleLoginIOS */,
+				6615EC182D77133E009EEC33 /* simpleLoginIOSTests */,
+				6615EC222D77133F009EEC33 /* simpleLoginIOSUITests */,
+				6615EC062D77133C009EEC33 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		6615EC062D77133C009EEC33 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6615EC052D77133C009EEC33 /* simpleLoginIOS.app */,
+				6615EC152D77133E009EEC33 /* simpleLoginIOSTests.xctest */,
+				6615EC1F2D77133F009EEC33 /* simpleLoginIOSUITests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		6615EC042D77133C009EEC33 /* simpleLoginIOS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6615EC292D77133F009EEC33 /* Build configuration list for PBXNativeTarget "simpleLoginIOS" */;
+			buildPhases = (
+				6615EC412D7713E5009EEC33 /* ShellScript */,
+				6615EC012D77133C009EEC33 /* Sources */,
+				6615EC022D77133C009EEC33 /* Frameworks */,
+				6615EC032D77133C009EEC33 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			fileSystemSynchronizedGroups = (
+				6615EC072D77133C009EEC33 /* simpleLoginIOS */,
+			);
+			name = simpleLoginIOS;
+			packageProductDependencies = (
+			);
+			productName = simpleLoginIOS;
+			productReference = 6615EC052D77133C009EEC33 /* simpleLoginIOS.app */;
+			productType = "com.apple.product-type.application";
+		};
+		6615EC142D77133E009EEC33 /* simpleLoginIOSTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6615EC2C2D77133F009EEC33 /* Build configuration list for PBXNativeTarget "simpleLoginIOSTests" */;
+			buildPhases = (
+				6615EC112D77133E009EEC33 /* Sources */,
+				6615EC122D77133E009EEC33 /* Frameworks */,
+				6615EC132D77133E009EEC33 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				6615EC172D77133E009EEC33 /* PBXTargetDependency */,
+			);
+			fileSystemSynchronizedGroups = (
+				6615EC182D77133E009EEC33 /* simpleLoginIOSTests */,
+			);
+			name = simpleLoginIOSTests;
+			packageProductDependencies = (
+			);
+			productName = simpleLoginIOSTests;
+			productReference = 6615EC152D77133E009EEC33 /* simpleLoginIOSTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+		6615EC1E2D77133F009EEC33 /* simpleLoginIOSUITests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6615EC2F2D77133F009EEC33 /* Build configuration list for PBXNativeTarget "simpleLoginIOSUITests" */;
+			buildPhases = (
+				6615EC1B2D77133F009EEC33 /* Sources */,
+				6615EC1C2D77133F009EEC33 /* Frameworks */,
+				6615EC1D2D77133F009EEC33 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				6615EC212D77133F009EEC33 /* PBXTargetDependency */,
+			);
+			fileSystemSynchronizedGroups = (
+				6615EC222D77133F009EEC33 /* simpleLoginIOSUITests */,
+			);
+			name = simpleLoginIOSUITests;
+			packageProductDependencies = (
+			);
+			productName = simpleLoginIOSUITests;
+			productReference = 6615EC1F2D77133F009EEC33 /* simpleLoginIOSUITests.xctest */;
+			productType = "com.apple.product-type.bundle.ui-testing";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		6615EBFD2D77133C009EEC33 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				BuildIndependentTargetsInParallel = 1;
+				LastSwiftUpdateCheck = 1620;
+				LastUpgradeCheck = 1620;
+				TargetAttributes = {
+					6615EC042D77133C009EEC33 = {
+						CreatedOnToolsVersion = 16.2;
+					};
+					6615EC142D77133E009EEC33 = {
+						CreatedOnToolsVersion = 16.2;
+						TestTargetID = 6615EC042D77133C009EEC33;
+					};
+					6615EC1E2D77133F009EEC33 = {
+						CreatedOnToolsVersion = 16.2;
+						TestTargetID = 6615EC042D77133C009EEC33;
+					};
+				};
+			};
+			buildConfigurationList = 6615EC002D77133C009EEC33 /* Build configuration list for PBXProject "simpleLoginIOS" */;
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 6615EBFC2D77133C009EEC33;
+			minimizedProjectReferenceProxies = 1;
+			preferredProjectObjectVersion = 77;
+			productRefGroup = 6615EC062D77133C009EEC33 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				6615EC042D77133C009EEC33 /* simpleLoginIOS */,
+				6615EC142D77133E009EEC33 /* simpleLoginIOSTests */,
+				6615EC1E2D77133F009EEC33 /* simpleLoginIOSUITests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		6615EC032D77133C009EEC33 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6615EC132D77133E009EEC33 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6615EC1D2D77133F009EEC33 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		6615EC412D7713E5009EEC33 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		6615EC012D77133C009EEC33 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6615EC112D77133E009EEC33 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6615EC1B2D77133F009EEC33 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		6615EC172D77133E009EEC33 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 6615EC042D77133C009EEC33 /* simpleLoginIOS */;
+			targetProxy = 6615EC162D77133E009EEC33 /* PBXContainerItemProxy */;
+		};
+		6615EC212D77133F009EEC33 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 6615EC042D77133C009EEC33 /* simpleLoginIOS */;
+			targetProxy = 6615EC202D77133F009EEC33 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		6615EC272D77133F009EEC33 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.2;
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		6615EC282D77133F009EEC33 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.2;
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		6615EC2A2D77133F009EEC33 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_ASSET_PATHS = "\"simpleLoginIOS/Preview Content\"";
+				DEVELOPMENT_TEAM = 63AG2R5KFS;
+				ENABLE_PREVIEWS = YES;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
+				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
+				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jetbrains.simpleLoginIOS;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		6615EC2B2D77133F009EEC33 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_ASSET_PATHS = "\"simpleLoginIOS/Preview Content\"";
+				DEVELOPMENT_TEAM = 63AG2R5KFS;
+				ENABLE_PREVIEWS = YES;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
+				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
+				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jetbrains.simpleLoginIOS;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+		6615EC2D2D77133F009EEC33 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 63AG2R5KFS;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.2;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jetbrains.simpleLoginIOSTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/simpleLoginIOS.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/simpleLoginIOS";
+			};
+			name = Debug;
+		};
+		6615EC2E2D77133F009EEC33 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 63AG2R5KFS;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.2;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jetbrains.simpleLoginIOSTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/simpleLoginIOS.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/simpleLoginIOS";
+			};
+			name = Release;
+		};
+		6615EC302D77133F009EEC33 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 63AG2R5KFS;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jetbrains.simpleLoginIOSUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_TARGET_NAME = simpleLoginIOS;
+			};
+			name = Debug;
+		};
+		6615EC312D77133F009EEC33 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 63AG2R5KFS;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jetbrains.simpleLoginIOSUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_TARGET_NAME = simpleLoginIOS;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		6615EC002D77133C009EEC33 /* Build configuration list for PBXProject "simpleLoginIOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6615EC272D77133F009EEC33 /* Debug */,
+				6615EC282D77133F009EEC33 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6615EC292D77133F009EEC33 /* Build configuration list for PBXNativeTarget "simpleLoginIOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6615EC2A2D77133F009EEC33 /* Debug */,
+				6615EC2B2D77133F009EEC33 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6615EC2C2D77133F009EEC33 /* Build configuration list for PBXNativeTarget "simpleLoginIOSTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6615EC2D2D77133F009EEC33 /* Debug */,
+				6615EC2E2D77133F009EEC33 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6615EC2F2D77133F009EEC33 /* Build configuration list for PBXNativeTarget "simpleLoginIOSUITests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6615EC302D77133F009EEC33 /* Debug */,
+				6615EC312D77133F009EEC33 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 6615EBFD2D77133C009EEC33 /* Project object */;
+}
diff --git a/iosApp/simpleLoginIOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/iosApp/simpleLoginIOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..919434a
--- /dev/null
+++ b/iosApp/simpleLoginIOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/iosApp/simpleLoginIOS.xcodeproj/project.xcworkspace/xcuserdata/pamelahill.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/simpleLoginIOS.xcodeproj/project.xcworkspace/xcuserdata/pamelahill.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..5c05c3e
Binary files /dev/null and b/iosApp/simpleLoginIOS.xcodeproj/project.xcworkspace/xcuserdata/pamelahill.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/iosApp/simpleLoginIOS.xcodeproj/xcuserdata/pamelahill.xcuserdatad/xcschemes/xcschememanagement.plist b/iosApp/simpleLoginIOS.xcodeproj/xcuserdata/pamelahill.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..3853265
--- /dev/null
+++ b/iosApp/simpleLoginIOS.xcodeproj/xcuserdata/pamelahill.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>simpleLoginIOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/iosApp/simpleLoginIOS/Assets.xcassets/AccentColor.colorset/Contents.json b/iosApp/simpleLoginIOS/Assets.xcassets/AccentColor.colorset/Contents.json
new file mode 100644
index 0000000..eb87897
--- /dev/null
+++ b/iosApp/simpleLoginIOS/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iosApp/simpleLoginIOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/iosApp/simpleLoginIOS/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000..2305880
--- /dev/null
+++ b/iosApp/simpleLoginIOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,35 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iosApp/simpleLoginIOS/Assets.xcassets/Contents.json b/iosApp/simpleLoginIOS/Assets.xcassets/Contents.json
new file mode 100644
index 0000000..73c0059
--- /dev/null
+++ b/iosApp/simpleLoginIOS/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iosApp/simpleLoginIOS/ContentView.swift b/iosApp/simpleLoginIOS/ContentView.swift
new file mode 100644
index 0000000..7387c24
--- /dev/null
+++ b/iosApp/simpleLoginIOS/ContentView.swift
@@ -0,0 +1,109 @@
+import SwiftUI
+import sharedKit
+
+struct ContentView: View {
+    @State private var username: String = ""
+    @State private var password: String = ""
+
+    @ObservedObject var viewModel: ContentView.ViewModel
+
+    var body: some View {
+        VStack(spacing: 15.0) {
+            ValidatedTextField(titleKey: "Username", secured: false, text: $username, errorMessage: viewModel.formState.usernameError, onChange: {
+                viewModel.loginDataChanged(username: username, password: password)
+            })
+            ValidatedTextField(titleKey: "Password", secured: true, text: $password, errorMessage: viewModel.formState.passwordError, onChange: {
+                viewModel.loginDataChanged(username: username, password: password)
+            })
+            Button("Login") {
+                viewModel.login(username: username, password: password)
+            }.disabled(!viewModel.formState.isDataValid || (username.isEmpty && password.isEmpty))
+        }
+        .padding(.all)
+    }
+}
+
+struct ValidatedTextField: View {
+    let titleKey: String
+    let secured: Bool
+    @Binding var text: String
+    let errorMessage: String?
+    let onChange: () -> ()
+
+    @ViewBuilder var textField: some View {
+        if secured {
+            SecureField(titleKey, text: $text)
+        }  else {
+            TextField(titleKey, text: $text)
+        }
+    }
+
+    var body: some View {
+        ZStack {
+            textField
+                .textFieldStyle(RoundedBorderTextFieldStyle())
+                .autocapitalization(.none)
+                .onChange(of: text) { _ in
+                    onChange()
+                }
+            if let errorMessage = errorMessage {
+                HStack {
+                    Spacer()
+                    FieldTextErrorHint(error: errorMessage)
+                }.padding(.horizontal, 5)
+            }
+        }
+    }
+}
+
+struct FieldTextErrorHint: View {
+    let error: String
+    @State private var showingAlert = false
+
+    var body: some View {
+        Button(action: { self.showingAlert = true }) {
+            Image(systemName: "exclamationmark.triangle.fill")
+                .foregroundColor(.red)
+        }
+        .alert(isPresented: $showingAlert) {
+            Alert(title: Text("Error"), message: Text(error), dismissButton: .default(Text("Got it!")))
+        }
+    }
+}
+
+extension ContentView {
+
+    struct LoginFormState {
+        let usernameError: String?
+        let passwordError: String?
+        var isDataValid: Bool {
+            get { return usernameError == nil && passwordError == nil }
+        }
+    }
+
+    class ViewModel: ObservableObject {
+        @Published var formState = LoginFormState(usernameError: nil, passwordError: nil)
+
+        let loginValidator: LoginDataValidator
+        let loginRepository: LoginRepository
+
+        init(loginRepository: LoginRepository, loginValidator: LoginDataValidator) {
+            self.loginRepository = loginRepository
+            self.loginValidator = loginValidator
+        }
+
+        func login(username: String, password: String) {
+            if let result = loginRepository.login(username: username, password: password) as? ResultSuccess  {
+                print("Successful login. Welcome, \(result.data.displayName)")
+            } else {
+                print("Error while logging in")
+            }
+        }
+
+        func loginDataChanged(username: String, password: String) {
+            formState = LoginFormState(
+                usernameError: (loginValidator.checkUsername(username: username) as? LoginDataValidator.ResultError)?.message,
+                passwordError: (loginValidator.checkPassword(password: password) as? LoginDataValidator.ResultError)?.message)
+        }
+    }
+}
diff --git a/iosApp/simpleLoginIOS/Preview Content/Preview Assets.xcassets/Contents.json b/iosApp/simpleLoginIOS/Preview Content/Preview Assets.xcassets/Contents.json
new file mode 100644
index 0000000..73c0059
--- /dev/null
+++ b/iosApp/simpleLoginIOS/Preview Content/Preview Assets.xcassets/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iosApp/simpleLoginIOS/simpleLoginIOSApp.swift b/iosApp/simpleLoginIOS/simpleLoginIOSApp.swift
new file mode 100644
index 0000000..6fb756e
--- /dev/null
+++ b/iosApp/simpleLoginIOS/simpleLoginIOSApp.swift
@@ -0,0 +1,11 @@
+import SwiftUI
+import sharedKit
+
+@main
+struct SimpleLoginIOSApp: App {
+    var body: some Scene {
+        WindowGroup {
+            ContentView(viewModel: .init(loginRepository: LoginRepository(dataSource: LoginDataSource()), loginValidator: LoginDataValidator()))
+        }
+    }
+}
diff --git a/iosApp/simpleLoginIOSTests/simpleLoginIOSTests.swift b/iosApp/simpleLoginIOSTests/simpleLoginIOSTests.swift
new file mode 100644
index 0000000..266a83c
--- /dev/null
+++ b/iosApp/simpleLoginIOSTests/simpleLoginIOSTests.swift
@@ -0,0 +1,17 @@
+//
+//  simpleLoginIOSTests.swift
+//  simpleLoginIOSTests
+//
+//  Created by Pamela Hill on 2025/03/04.
+//
+
+import Testing
+@testable import simpleLoginIOS
+
+struct simpleLoginIOSTests {
+
+    @Test func example() async throws {
+        // Write your test here and use APIs like `#expect(...)` to check expected conditions.
+    }
+
+}
diff --git a/iosApp/simpleLoginIOSUITests/simpleLoginIOSUITests.swift b/iosApp/simpleLoginIOSUITests/simpleLoginIOSUITests.swift
new file mode 100644
index 0000000..0a098d7
--- /dev/null
+++ b/iosApp/simpleLoginIOSUITests/simpleLoginIOSUITests.swift
@@ -0,0 +1,43 @@
+//
+//  simpleLoginIOSUITests.swift
+//  simpleLoginIOSUITests
+//
+//  Created by Pamela Hill on 2025/03/04.
+//
+
+import XCTest
+
+final class simpleLoginIOSUITests: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+
+        // In UI tests it is usually best to stop immediately when a failure occurs.
+        continueAfterFailure = false
+
+        // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    @MainActor
+    func testExample() throws {
+        // UI tests must launch the application that they test.
+        let app = XCUIApplication()
+        app.launch()
+
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    }
+
+    @MainActor
+    func testLaunchPerformance() throws {
+        if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 7.0, *) {
+            // This measures how long it takes to launch your application.
+            measure(metrics: [XCTApplicationLaunchMetric()]) {
+                XCUIApplication().launch()
+            }
+        }
+    }
+}
diff --git a/iosApp/simpleLoginIOSUITests/simpleLoginIOSUITestsLaunchTests.swift b/iosApp/simpleLoginIOSUITests/simpleLoginIOSUITestsLaunchTests.swift
new file mode 100644
index 0000000..f506563
--- /dev/null
+++ b/iosApp/simpleLoginIOSUITests/simpleLoginIOSUITestsLaunchTests.swift
@@ -0,0 +1,33 @@
+//
+//  simpleLoginIOSUITestsLaunchTests.swift
+//  simpleLoginIOSUITests
+//
+//  Created by Pamela Hill on 2025/03/04.
+//
+
+import XCTest
+
+final class simpleLoginIOSUITestsLaunchTests: XCTestCase {
+
+    override class var runsForEachTargetApplicationUIConfiguration: Bool {
+        true
+    }
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+    }
+
+    @MainActor
+    func testLaunch() throws {
+        let app = XCUIApplication()
+        app.launch()
+
+        // Insert steps here to perform after app launch but before taking a screenshot,
+        // such as logging into a test account or navigating somewhere in the app
+
+        let attachment = XCTAttachment(screenshot: app.screenshot())
+        attachment.name = "Launch Screen"
+        attachment.lifetime = .keepAlways
+        add(attachment)
+    }
+}
diff --git a/iosApp/simpleloginIOS.xcodeproj/project.xcworkspace/xcuserdata/pamelahill.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/simpleloginIOS.xcodeproj/project.xcworkspace/xcuserdata/pamelahill.xcuserdatad/UserInterfaceState.xcuserstate
index b3965cd..cbd7fe3 100644
Binary files a/iosApp/simpleloginIOS.xcodeproj/project.xcworkspace/xcuserdata/pamelahill.xcuserdatad/UserInterfaceState.xcuserstate and b/iosApp/simpleloginIOS.xcodeproj/project.xcworkspace/xcuserdata/pamelahill.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/iosApp/simpleloginIOS/ContentView.swift b/iosApp/simpleloginIOS/ContentView.swift
index 3e89ff8..7387c24 100644
--- a/iosApp/simpleloginIOS/ContentView.swift
+++ b/iosApp/simpleloginIOS/ContentView.swift
@@ -1,5 +1,5 @@
 import SwiftUI
-import shared
+import sharedKit
 
 struct ContentView: View {
     @State private var username: String = ""
diff --git a/iosApp/simpleloginIOS/simpleloginIOSApp.swift b/iosApp/simpleloginIOS/simpleloginIOSApp.swift
index 044eeb1..6fb756e 100644
--- a/iosApp/simpleloginIOS/simpleloginIOSApp.swift
+++ b/iosApp/simpleloginIOS/simpleloginIOSApp.swift
@@ -1,5 +1,5 @@
 import SwiftUI
-import shared
+import sharedKit
 
 @main
 struct SimpleLoginIOSApp: App {
diff --git a/shared/.gitignore b/shared/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/shared/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 08df06b..56b631b 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -1,53 +1,99 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    alias(libs.plugins.android.kotlin.multiplatform.library)
 }
 
 kotlin {
-    androidTarget {
-        @OptIn(ExperimentalKotlinGradlePluginApi::class)
-        compilerOptions {
-            jvmTarget = JVM_1_8
+
+// Target declarations - add or remove as needed below. These define
+// which platforms this KMP module supports.
+// See: https://kotlinlang.org/docs/multiplatform-discover-project.html#targets
+    androidLibrary {
+        namespace = "com.jetbrains.simplelogin.shared"
+        compileSdk = 35
+        minSdk = 24
+
+        withHostTestBuilder {
+        }
+
+        withDeviceTestBuilder {
+            sourceSetTreeName = "test"
+        }.configure {
+            instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        }
+    }
+
+// For iOS targets, this is also where you should
+// configure native binary output. For more information, see:
+// https://kotlinlang.org/docs/multiplatform-build-native-binaries.html#build-xcframeworks
+
+// A step-by-step guide on how to include this library in an XCode
+// project can be found here:
+// https://developer.android.com/kotlin/multiplatform/migrate
+    val xcfName = "sharedKit"
+
+    iosX64 {
+        binaries.framework {
+            baseName = xcfName
         }
     }
 
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    iosArm64 {
+        binaries.framework {
+            baseName = xcfName
+        }
+    }
 
-    targets.withType<KotlinNativeTarget>().configureEach {
+    iosSimulatorArm64 {
         binaries.framework {
-            baseName = "shared"
-            isStatic = true
+            baseName = xcfName
         }
     }
 
+// Source set declarations.
+// Declaring a target automatically creates a source set with the same name. By default, the
+// Kotlin Gradle Plugin creates additional source sets that depend on each other, since it is
+// common to share sources between related targets.
+// See: https://kotlinlang.org/docs/multiplatform-hierarchy.html
     sourceSets {
         commonMain {
             dependencies {
-                //put your multiplatform dependencies here
+                implementation(libs.kotlin.stdlib)
+                // Add KMP dependencies here
             }
         }
+
         commonTest {
             dependencies {
                 implementation(libs.kotlin.test)
             }
         }
-    }
-}
 
-android {
-    namespace = "com.jetbrains.simplelogin.shared"
-    compileSdk = 34
-    defaultConfig {
-        minSdk = 21
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        androidMain {
+            dependencies {
+                // Add Android-specific dependencies here. Note that this source set depends on
+                // commonMain by default and will correctly pull the Android artifacts of any KMP
+                // dependencies declared in commonMain.
+            }
+        }
+
+        getByName("androidDeviceTest") {
+            dependencies {
+                implementation(libs.androidx.runner)
+                implementation(libs.androidx.core)
+                implementation(libs.androidx.test.junit)
+            }
+        }
+
+        iosMain {
+            dependencies {
+                // Add iOS-specific dependencies here. This a source set created by Kotlin Gradle
+                // Plugin (KGP) that each specific iOS target (e.g., iosX64) depends on as
+                // part of KMP’s default source set hierarchy. Note that this source set depends
+                // on common by default and will correctly pull the iOS artifacts of any
+                // KMP dependencies declared in commonMain.
+            }
+        }
     }
-}
+
+}
\ No newline at end of file
diff --git a/shared/src/androidDeviceTest/kotlin/com/jetbrains/simplelogin/shared/ExampleInstrumentedTest.kt b/shared/src/androidDeviceTest/kotlin/com/jetbrains/simplelogin/shared/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..1fc91f5
--- /dev/null
+++ b/shared/src/androidDeviceTest/kotlin/com/jetbrains/simplelogin/shared/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.jetbrains.simplelogin.shared
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.jetbrains.simplelogin.shared.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/shared/src/androidHostTest/kotlin/com/jetbrains/simplelogin/shared/ExampleUnitTest.kt b/shared/src/androidHostTest/kotlin/com/jetbrains/simplelogin/shared/ExampleUnitTest.kt
new file mode 100644
index 0000000..3144e24
--- /dev/null
+++ b/shared/src/androidHostTest/kotlin/com/jetbrains/simplelogin/shared/ExampleUnitTest.kt
@@ -0,0 +1,16 @@
+package com.jetbrains.simplelogin.shared
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/shared/src/androidMain/AndroidManifest.xml b/shared/src/androidMain/AndroidManifest.xml
new file mode 100644
index 0000000..a5918e6
--- /dev/null
+++ b/shared/src/androidMain/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/shared/src/androidMain/kotlin/com/jetbrains/simplelogin/shared/Platform.android.kt b/shared/src/androidMain/kotlin/com/jetbrains/simplelogin/shared/Platform.android.kt
index 00ff40b..4df289b 100644
--- a/shared/src/androidMain/kotlin/com/jetbrains/simplelogin/shared/Platform.android.kt
+++ b/shared/src/androidMain/kotlin/com/jetbrains/simplelogin/shared/Platform.android.kt
@@ -1,7 +1,9 @@
 package com.jetbrains.simplelogin.shared
 
+import android.os.Build
+
 class AndroidPlatform : Platform {
-    override val name: String = "Android ${android.os.Build.VERSION.SDK_INT}"
+    override val name: String = "Android ${Build.VERSION.SDK_INT}"
 }
 
 actual fun getPlatform(): Platform = AndroidPlatform()
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/LoginDataSource.kt b/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/LoginDataSource.kt
similarity index 78%
rename from shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/LoginDataSource.kt
rename to shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/LoginDataSource.kt
index 41a566c..f1a3a55 100644
--- a/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/LoginDataSource.kt
+++ b/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/LoginDataSource.kt
@@ -1,6 +1,7 @@
-package com.jetbrains.simplelogin.shared
+package com.jetbrains.simplelogin.shared.data
 
-import com.jetbrains.simplelogin.shared.model.LoggedInUser
+import com.jetbrains.simplelogin.shared.data.model.LoggedInUser
+import com.jetbrains.simplelogin.shared.randomUUID
 
 /**
  * Class that handles authentication w/ login credentials and retrieves user information.
diff --git a/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/LoginDataValidator.kt b/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/LoginDataValidator.kt
similarity index 96%
rename from shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/LoginDataValidator.kt
rename to shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/LoginDataValidator.kt
index 15d55e8..6d9ec6e 100644
--- a/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/LoginDataValidator.kt
+++ b/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/LoginDataValidator.kt
@@ -1,4 +1,4 @@
-package com.jetbrains.simplelogin.shared
+package com.jetbrains.simplelogin.shared.data
 
 class LoginDataValidator {
 
diff --git a/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/LoginRepository.kt b/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/LoginRepository.kt
similarity index 91%
rename from shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/LoginRepository.kt
rename to shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/LoginRepository.kt
index 3a99018..72a994f 100644
--- a/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/LoginRepository.kt
+++ b/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/LoginRepository.kt
@@ -1,6 +1,6 @@
-package com.jetbrains.simplelogin.shared
+package com.jetbrains.simplelogin.shared.data
 
-import com.jetbrains.simplelogin.shared.model.LoggedInUser
+import com.jetbrains.simplelogin.shared.data.model.LoggedInUser
 
 /**
  * Class that requests authentication and user information from the remote data source and
diff --git a/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/Result.kt b/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/Result.kt
similarity index 90%
rename from shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/Result.kt
rename to shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/Result.kt
index d57cb6c..95914ad 100644
--- a/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/Result.kt
+++ b/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/Result.kt
@@ -1,4 +1,4 @@
-package com.jetbrains.simplelogin.shared
+package com.jetbrains.simplelogin.shared.data
 
 /**
  * A generic class that holds a value with its loading status.
diff --git a/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/model/LoggedInUser.kt b/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/model/LoggedInUser.kt
similarity index 77%
rename from shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/model/LoggedInUser.kt
rename to shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/model/LoggedInUser.kt
index c470fbe..d24f037 100644
--- a/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/model/LoggedInUser.kt
+++ b/shared/src/commonMain/kotlin/com/jetbrains/simplelogin/shared/data/model/LoggedInUser.kt
@@ -1,4 +1,4 @@
-package com.jetbrains.simplelogin.shared.model
+package com.jetbrains.simplelogin.shared.data.model
 
 /**
  * Data class that captures user information for logged in users retrieved from LoginRepository