diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/AppTests.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/AppTests.xcscheme
index 80869a7..4375501 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/AppTests.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/AppTests.xcscheme
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1540"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
@@ -22,9 +23,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AppCoreTests"
-               BuildableName = "AppCoreTests"
-               BlueprintName = "AppCoreTests"
+               BlueprintIdentifier = "BadaCoreTests"
+               BuildableName = "BadaCoreTests"
+               BlueprintName = "BadaCoreTests"
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/AppUI.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BadaCore.xcscheme
similarity index 77%
rename from .swiftpm/xcode/xcshareddata/xcschemes/AppUI.xcscheme
rename to .swiftpm/xcode/xcshareddata/xcschemes/BadaCore.xcscheme
index df7ba3d..526fe88 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/AppUI.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/BadaCore.xcscheme
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1540"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -14,9 +15,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AppUI"
-               BuildableName = "AppUI"
-               BlueprintName = "AppUI"
+               BlueprintIdentifier = "BadaCore"
+               BuildableName = "BadaCore"
+               BlueprintName = "BadaCore"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -26,13 +27,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <TestPlans>
-         <TestPlanReference
-            reference = "container:App/TestPlans/AppUITests.xctestplan"
-            default = "YES">
-         </TestPlanReference>
-      </TestPlans>
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -54,9 +50,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "AppUI"
-            BuildableName = "AppUI"
-            BlueprintName = "AppUI"
+            BlueprintIdentifier = "BadaCore"
+            BuildableName = "BadaCore"
+            BlueprintName = "BadaCore"
             ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/AppCore.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BadaData.xcscheme
similarity index 77%
rename from .swiftpm/xcode/xcshareddata/xcschemes/AppCore.xcscheme
rename to .swiftpm/xcode/xcshareddata/xcschemes/BadaData.xcscheme
index c7749a2..68f6b2a 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/AppCore.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/BadaData.xcscheme
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1540"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -14,9 +15,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AppCore"
-               BuildableName = "AppCore"
-               BlueprintName = "AppCore"
+               BlueprintIdentifier = "BadaData"
+               BuildableName = "BadaData"
+               BlueprintName = "BadaData"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -26,13 +27,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <TestPlans>
-         <TestPlanReference
-            reference = "container:App/TestPlans/AppCoreTests.xctestplan"
-            default = "YES">
-         </TestPlanReference>
-      </TestPlans>
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -54,9 +50,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "AppCore"
-            BuildableName = "AppCore"
-            BlueprintName = "AppCore"
+            BlueprintIdentifier = "BadaData"
+            BuildableName = "BadaData"
+            BlueprintName = "BadaData"
             ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/BadaDomain.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BadaDomain.xcscheme
new file mode 100644
index 0000000..79cc9d7
--- /dev/null
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/BadaDomain.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BadaDomain"
+               BuildableName = "BadaDomain"
+               BlueprintName = "BadaDomain"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BadaDomain"
+            BuildableName = "BadaDomain"
+            BlueprintName = "BadaDomain"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/BadaUI.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BadaUI.xcscheme
new file mode 100644
index 0000000..68ec8b0
--- /dev/null
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/BadaUI.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BadaUI"
+               BuildableName = "BadaUI"
+               BlueprintName = "BadaUI"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BadaUI"
+            BuildableName = "BadaUI"
+            BlueprintName = "BadaUI"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/App/BadaBook.xcodeproj/project.pbxproj b/App/BadaBook.xcodeproj/project.pbxproj
index ee8cbdc..1bf7f90 100644
--- a/App/BadaBook.xcodeproj/project.pbxproj
+++ b/App/BadaBook.xcodeproj/project.pbxproj
@@ -7,12 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		C3D4DF6D2B78C68600824E65 /* AppCore in Frameworks */ = {isa = PBXBuildFile; productRef = C3D4DF6C2B78C68600824E65 /* AppCore */; };
-		C3D4DF6F2B78C68900824E65 /* AppUI in Frameworks */ = {isa = PBXBuildFile; productRef = C3D4DF6E2B78C68900824E65 /* AppUI */; };
-		C3D4DF712B78C69200824E65 /* AppCore in Frameworks */ = {isa = PBXBuildFile; productRef = C3D4DF702B78C69200824E65 /* AppCore */; };
-		C3D4DF732B78C69200824E65 /* AppUI in Frameworks */ = {isa = PBXBuildFile; productRef = C3D4DF722B78C69200824E65 /* AppUI */; };
-		C3D4DF752B78C69D00824E65 /* AppCore in Frameworks */ = {isa = PBXBuildFile; productRef = C3D4DF742B78C69D00824E65 /* AppCore */; };
-		C3D4DF772B78C69D00824E65 /* AppUI in Frameworks */ = {isa = PBXBuildFile; productRef = C3D4DF762B78C69D00824E65 /* AppUI */; };
+		C305F3AF2C8451F90046256D /* BadaCore in Frameworks */ = {isa = PBXBuildFile; productRef = C305F3AE2C8451F90046256D /* BadaCore */; };
+		C305F3B12C8451F90046256D /* BadaUI in Frameworks */ = {isa = PBXBuildFile; productRef = C305F3B02C8451F90046256D /* BadaUI */; };
+		C305F3B32C8452000046256D /* BadaCore in Frameworks */ = {isa = PBXBuildFile; productRef = C305F3B22C8452000046256D /* BadaCore */; };
+		C305F3B52C8452000046256D /* BadaUI in Frameworks */ = {isa = PBXBuildFile; productRef = C305F3B42C8452000046256D /* BadaUI */; };
+		C305F3B72C8452070046256D /* BadaCore in Frameworks */ = {isa = PBXBuildFile; productRef = C305F3B62C8452070046256D /* BadaCore */; };
+		C305F3B92C8452070046256D /* BadaUI in Frameworks */ = {isa = PBXBuildFile; productRef = C305F3B82C8452070046256D /* BadaUI */; };
 		C3DC6EB62B78B76000E1968B /* MacApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DC6EB52B78B76000E1968B /* MacApp.swift */; };
 		C3DC6EBA2B78B76100E1968B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3DC6EB92B78B76100E1968B /* Assets.xcassets */; };
 		C3DC6EDB2B78B8E800E1968B /* PhoneApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DC6EDA2B78B8E800E1968B /* PhoneApp.swift */; };
@@ -46,8 +46,6 @@
 		C3DC6EEA2B78B9A200E1968B /* iPadOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iPadOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C3E08D2D2B78B9DF00659303 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		C3E08D302B78B9DF00659303 /* PadApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PadApp.swift; sourceTree = "<group>"; };
-		C3EF5F642B78CB0900215B9C /* AppCoreTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = AppCoreTests.xctestplan; sourceTree = "<group>"; };
-		C3EF5F652B78CB1400215B9C /* AppUITests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = AppUITests.xctestplan; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -55,8 +53,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C3D4DF772B78C69D00824E65 /* AppUI in Frameworks */,
-				C3D4DF752B78C69D00824E65 /* AppCore in Frameworks */,
+				C305F3B92C8452070046256D /* BadaUI in Frameworks */,
+				C305F3B72C8452070046256D /* BadaCore in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -64,8 +62,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C3D4DF6F2B78C68900824E65 /* AppUI in Frameworks */,
-				C3D4DF6D2B78C68600824E65 /* AppCore in Frameworks */,
+				C305F3B12C8451F90046256D /* BadaUI in Frameworks */,
+				C305F3AF2C8451F90046256D /* BadaCore in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -73,8 +71,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C3D4DF732B78C69200824E65 /* AppUI in Frameworks */,
-				C3D4DF712B78C69200824E65 /* AppCore in Frameworks */,
+				C305F3B52C8452000046256D /* BadaUI in Frameworks */,
+				C305F3B32C8452000046256D /* BadaCore in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -94,9 +92,7 @@
 		C3CAD57E2B78C8A000C7344D /* TestPlans */ = {
 			isa = PBXGroup;
 			children = (
-				C3EF5F642B78CB0900215B9C /* AppCoreTests.xctestplan */,
 				C3CAD57F2B78C8CA00C7344D /* AppTests.xctestplan */,
-				C3EF5F652B78CB1400215B9C /* AppUITests.xctestplan */,
 			);
 			path = TestPlans;
 			sourceTree = "<group>";
@@ -173,8 +169,8 @@
 			);
 			name = macOS;
 			packageProductDependencies = (
-				C3D4DF742B78C69D00824E65 /* AppCore */,
-				C3D4DF762B78C69D00824E65 /* AppUI */,
+				C305F3B62C8452070046256D /* BadaCore */,
+				C305F3B82C8452070046256D /* BadaUI */,
 			);
 			productName = macOS;
 			productReference = C3DC6EB32B78B76000E1968B /* macOS.app */;
@@ -195,8 +191,8 @@
 			);
 			name = iOS;
 			packageProductDependencies = (
-				C3D4DF6C2B78C68600824E65 /* AppCore */,
-				C3D4DF6E2B78C68900824E65 /* AppUI */,
+				C305F3AE2C8451F90046256D /* BadaCore */,
+				C305F3B02C8451F90046256D /* BadaUI */,
 			);
 			productName = iOS;
 			productReference = C3DC6ED82B78B8E800E1968B /* iOS.app */;
@@ -216,8 +212,8 @@
 			);
 			name = iPadOS;
 			packageProductDependencies = (
-				C3D4DF702B78C69200824E65 /* AppCore */,
-				C3D4DF722B78C69200824E65 /* AppUI */,
+				C305F3B22C8452000046256D /* BadaCore */,
+				C305F3B42C8452000046256D /* BadaUI */,
 			);
 			productName = iPadOS;
 			productReference = C3DC6EEA2B78B9A200E1968B /* iPadOS.app */;
@@ -695,29 +691,29 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		C3D4DF6C2B78C68600824E65 /* AppCore */ = {
+		C305F3AE2C8451F90046256D /* BadaCore */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = AppCore;
+			productName = BadaCore;
 		};
-		C3D4DF6E2B78C68900824E65 /* AppUI */ = {
+		C305F3B02C8451F90046256D /* BadaUI */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = AppUI;
+			productName = BadaUI;
 		};
-		C3D4DF702B78C69200824E65 /* AppCore */ = {
+		C305F3B22C8452000046256D /* BadaCore */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = AppCore;
+			productName = BadaCore;
 		};
-		C3D4DF722B78C69200824E65 /* AppUI */ = {
+		C305F3B42C8452000046256D /* BadaUI */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = AppUI;
+			productName = BadaUI;
 		};
-		C3D4DF742B78C69D00824E65 /* AppCore */ = {
+		C305F3B62C8452070046256D /* BadaCore */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = AppCore;
+			productName = BadaCore;
 		};
-		C3D4DF762B78C69D00824E65 /* AppUI */ = {
+		C305F3B82C8452070046256D /* BadaUI */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = AppUI;
+			productName = BadaUI;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};
diff --git a/App/BadaBook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/App/BadaBook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 0000000..de76ee2
--- /dev/null
+++ b/App/BadaBook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,15 @@
+{
+  "originHash" : "a98a66492243515afe85bee75488bbe9a769c5dcd8de061ba51320dc7d217361",
+  "pins" : [
+    {
+      "identity" : "oneway",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/DevYeom/OneWay.git",
+      "state" : {
+        "revision" : "bc687d5f5d210e9985e5c235d1d88c66bd731a31",
+        "version" : "2.6.0"
+      }
+    }
+  ],
+  "version" : 3
+}
diff --git a/App/Platforms/iOS/PhoneApp.swift b/App/Platforms/iOS/PhoneApp.swift
index 4c6ed1c..cbfd17a 100644
--- a/App/Platforms/iOS/PhoneApp.swift
+++ b/App/Platforms/iOS/PhoneApp.swift
@@ -1,5 +1,5 @@
-import AppCore
-import AppUI
+import BadaCore
+import BadaUI
 import SwiftUI
 
 @main
diff --git a/App/Platforms/iPadOS/PadApp.swift b/App/Platforms/iPadOS/PadApp.swift
index e822cc2..d9e5f53 100644
--- a/App/Platforms/iPadOS/PadApp.swift
+++ b/App/Platforms/iPadOS/PadApp.swift
@@ -1,5 +1,5 @@
-import AppCore
-import AppUI
+import BadaCore
+import BadaUI
 import SwiftUI
 
 @main
diff --git a/App/Platforms/macOS/MacApp.swift b/App/Platforms/macOS/MacApp.swift
index 48fc362..6debff9 100644
--- a/App/Platforms/macOS/MacApp.swift
+++ b/App/Platforms/macOS/MacApp.swift
@@ -1,5 +1,5 @@
-import AppCore
-import AppUI
+import BadaCore
+import BadaUI
 import SwiftUI
 
 @main
diff --git a/App/TestPlans/AppCoreTests.xctestplan b/App/TestPlans/AppCoreTests.xctestplan
deleted file mode 100644
index 4378e98..0000000
--- a/App/TestPlans/AppCoreTests.xctestplan
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "configurations" : [
-    {
-      "id" : "B3810C3B-ED31-459D-A71B-FD842BB42958",
-      "name" : "Configuration 1",
-      "options" : {
-
-      }
-    }
-  ],
-  "defaultOptions" : {
-    "testTimeoutsEnabled" : true
-  },
-  "testTargets" : [
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "AppCoreTests",
-        "name" : "AppCoreTests"
-      }
-    }
-  ],
-  "version" : 1
-}
diff --git a/App/TestPlans/AppTests.xctestplan b/App/TestPlans/AppTests.xctestplan
index 7e827d1..965cbcf 100644
--- a/App/TestPlans/AppTests.xctestplan
+++ b/App/TestPlans/AppTests.xctestplan
@@ -15,15 +15,29 @@
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AppCoreTests",
-        "name" : "AppCoreTests"
+        "identifier" : "BadaCoreTests",
+        "name" : "BadaCoreTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AppUITests",
-        "name" : "AppUITests"
+        "identifier" : "BadaUITests",
+        "name" : "BadaUITests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "BadaDataTests",
+        "name" : "BadaDataTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "BadaDomainTests",
+        "name" : "BadaDomainTests"
       }
     }
   ],
diff --git a/App/TestPlans/AppUITests.xctestplan b/App/TestPlans/AppUITests.xctestplan
deleted file mode 100644
index 3106c93..0000000
--- a/App/TestPlans/AppUITests.xctestplan
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "configurations" : [
-    {
-      "id" : "136F5EF0-D6DA-41A2-A729-E478B85C4A4C",
-      "name" : "Configuration 1",
-      "options" : {
-
-      }
-    }
-  ],
-  "defaultOptions" : {
-    "testTimeoutsEnabled" : true
-  },
-  "testTargets" : [
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "AppUITests",
-        "name" : "AppUITests"
-      }
-    }
-  ],
-  "version" : 1
-}
diff --git a/Package.resolved b/Package.resolved
new file mode 100644
index 0000000..b747624
--- /dev/null
+++ b/Package.resolved
@@ -0,0 +1,15 @@
+{
+  "originHash" : "be7ed38fb49f186440c8848bee4bf7e11c005e527f677f96ab8a86d8575014c6",
+  "pins" : [
+    {
+      "identity" : "oneway",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/DevYeom/OneWay.git",
+      "state" : {
+        "revision" : "bc687d5f5d210e9985e5c235d1d88c66bd731a31",
+        "version" : "2.6.0"
+      }
+    }
+  ],
+  "version" : 3
+}
diff --git a/Package.swift b/Package.swift
index 281dbf1..030a202 100644
--- a/Package.swift
+++ b/Package.swift
@@ -9,29 +9,42 @@ let package = Package(
         .macOS(.v14),
     ],
     products: [
-        .library(
-            name: "AppCore",
-            targets: ["AppCore"]
-        ),
-        .library(
-            name: "AppUI",
-            targets: ["AppUI"]
-        ),
+        .library(name: "BadaCore", targets: ["BadaCore"]),
+        .library(name: "BadaData", targets: ["BadaData"]),
+        .library(name: "BadaDomain", targets: ["BadaDomain"]),
+        .library(name: "BadaUI", targets: ["BadaUI"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/DevYeom/OneWay.git", exact: "2.6.0"),
     ],
     targets: [
         .target(
-            name: "AppCore"
+            name: "BadaCore",
+            dependencies: [
+                "OneWay",
+            ]
         ),
         .testTarget(
-            name: "AppCoreTests",
-            dependencies: ["AppCore"]
+            name: "BadaCoreTests",
+            dependencies: ["BadaCore"]
         ),
-        .target(
-            name: "AppUI"
+
+        .target(name: "BadaData"),
+        .testTarget(
+            name: "BadaDataTests",
+            dependencies: ["BadaData"]
         ),
+
+        .target(name: "BadaDomain"),
+        .testTarget(
+            name: "BadaDomainTests",
+            dependencies: ["BadaDomain"]
+        ),
+
+        .target(name: "BadaUI"),
         .testTarget(
-            name: "AppUITests",
-            dependencies: ["AppUI"]
+            name: "BadaUITests",
+            dependencies: ["BadaUI"]
         ),
     ]
 )
diff --git a/Sources/AppCore/AppCore.swift b/Sources/BadaCore/BadaCore.swift
similarity index 100%
rename from Sources/AppCore/AppCore.swift
rename to Sources/BadaCore/BadaCore.swift
diff --git a/Sources/BadaCore/exported.swift b/Sources/BadaCore/exported.swift
new file mode 100644
index 0000000..d14439d
--- /dev/null
+++ b/Sources/BadaCore/exported.swift
@@ -0,0 +1 @@
+@_exported import OneWay
diff --git a/Sources/BadaData/BadaData.swift b/Sources/BadaData/BadaData.swift
new file mode 100644
index 0000000..fecc4ab
--- /dev/null
+++ b/Sources/BadaData/BadaData.swift
@@ -0,0 +1 @@
+import Foundation
diff --git a/Sources/BadaDomain/BadaDomain.swift b/Sources/BadaDomain/BadaDomain.swift
new file mode 100644
index 0000000..fecc4ab
--- /dev/null
+++ b/Sources/BadaDomain/BadaDomain.swift
@@ -0,0 +1 @@
+import Foundation
diff --git a/Sources/AppUI/ContentView.swift b/Sources/BadaUI/ContentView.swift
similarity index 100%
rename from Sources/AppUI/ContentView.swift
rename to Sources/BadaUI/ContentView.swift
diff --git a/Tests/AppCoreTests/AppCoreTests.swift b/Tests/BadaCoreTests/BadaCoreTests.swift
similarity index 57%
rename from Tests/AppCoreTests/AppCoreTests.swift
rename to Tests/BadaCoreTests/BadaCoreTests.swift
index 3bdb954..05cd63b 100644
--- a/Tests/AppCoreTests/AppCoreTests.swift
+++ b/Tests/BadaCoreTests/BadaCoreTests.swift
@@ -1,7 +1,7 @@
 import XCTest
-@testable import AppCore
+@testable import BadaCore
 
-final class AppCoreTests: XCTestCase {
+final class BadaCoreTests: XCTestCase {
     func testExample() throws {
         XCTAssertEqual(1 + 1, 2)
     }
diff --git a/Tests/BadaDataTests/BadaDataTests.swift b/Tests/BadaDataTests/BadaDataTests.swift
new file mode 100644
index 0000000..aa9b76b
--- /dev/null
+++ b/Tests/BadaDataTests/BadaDataTests.swift
@@ -0,0 +1,8 @@
+import XCTest
+@testable import BadaData
+
+final class BadaDataTests: XCTestCase {
+    func testExample() throws {
+        XCTAssertEqual(1 + 1, 2)
+    }
+}
diff --git a/Tests/BadaDomainTests/BadaDomainTests.swift b/Tests/BadaDomainTests/BadaDomainTests.swift
new file mode 100644
index 0000000..259a1e5
--- /dev/null
+++ b/Tests/BadaDomainTests/BadaDomainTests.swift
@@ -0,0 +1,8 @@
+import XCTest
+@testable import BadaDomain
+
+final class BadaDomainTests: XCTestCase {
+    func testExample() throws {
+        XCTAssertEqual(1 + 1, 2)
+    }
+}
diff --git a/Tests/AppUITests/AppUITests.swift b/Tests/BadaUITests/BadaUITests.swift
similarity index 62%
rename from Tests/AppUITests/AppUITests.swift
rename to Tests/BadaUITests/BadaUITests.swift
index ac2246d..178d899 100644
--- a/Tests/AppUITests/AppUITests.swift
+++ b/Tests/BadaUITests/BadaUITests.swift
@@ -1,8 +1,8 @@
 import SwiftUI
 import XCTest
-@testable import AppUI
+@testable import BadaUI
 
-final class AppUITests: XCTestCase {
+final class BadaUITests: XCTestCase {
     func testExample() throws {
         XCTAssertEqual(1 + 1, 2)
     }