diff --git a/.gitignore b/.gitignore
index d4cbeba..51bf6dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,75 +1,2 @@
-######################### Default #########################
-
-## Various / User settings 
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-*.xcuserstate
-*.xcbkptlist
-xcshareddata/WorkspaceSettings.xcsettings
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-## The following generated by .gitignore from Created Swift Package
-.DS_Store
-/.build
 /DerivedData
-/Packages
-/*.xcodeproj
-xcuserdata/
-DerivedData/
-.swiftpm/config/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-.netrc
-
-## Other
-*.mobileprovision
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
-
-######################### Customize #########################
-
-## Python
-*.pyc
-
-## Gemfile
-vendor/
-
-## XcodeGen
-Modules/**/*.pbxproj
-Modules/**/*.xcscheme
-
-## SwiftGen
-SwiftGen-*.swift
-
-## fastlane
-fastlane/README.md
-fastlane/report.xml
-fastlane/FastlaneRunner
-
-## Build/Test generated
-test_output/
-archive/
-
-## SnapshotTesting+XcodeCloud
-# ci_scripts/__Snapshots__
-
-## License
-com.mono0926.LicensePlist*
-
-## Other
-IDEWorkspaceChecks.plist
-contents.xcworkspacedata
-!PinkoiApp.xcworkspace/contents.xcworkspacedata
-!Modules/Pinkoi/.swiftpm/xcode/xcshareddata/xcschemes/Pinkoi-Package.xcscheme
-!Modules/PinkoiApp/PinkoiApp.xcodeproj/xcshareddata/xcschemes/PinkoiApp.xcscheme
+.DS_Store
\ No newline at end of file
diff --git a/PokemonGuider.xcodeproj/project.xcworkspace/xcuserdata/zhgchgli.xcuserdatad/UserInterfaceState.xcuserstate b/PokemonGuider.xcodeproj/project.xcworkspace/xcuserdata/zhgchgli.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..a0fc6c5
Binary files /dev/null and b/PokemonGuider.xcodeproj/project.xcworkspace/xcuserdata/zhgchgli.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuider.xcscheme b/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuider.xcscheme
new file mode 100644
index 0000000..9dc781b
--- /dev/null
+++ b/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuider.xcscheme
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1E6EAC0B2B899973004CC1D2"
+               BuildableName = "PokemonGuider.app"
+               BlueprintName = "PokemonGuider"
+               ReferencedContainer = "container:PokemonGuider.xcodeproj">
+            </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">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1E6EAC0B2B899973004CC1D2"
+            BuildableName = "PokemonGuider.app"
+            BlueprintName = "PokemonGuider"
+            ReferencedContainer = "container:PokemonGuider.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1E6EAC0B2B899973004CC1D2"
+            BuildableName = "PokemonGuider.app"
+            BlueprintName = "PokemonGuider"
+            ReferencedContainer = "container:PokemonGuider.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuiderSnapshotTests.xcscheme b/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuiderSnapshotTests.xcscheme
new file mode 100644
index 0000000..c4a30a3
--- /dev/null
+++ b/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuiderSnapshotTests.xcscheme
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1E32F7C52B8A344500EBA22C"
+               BuildableName = "PokemonGuiderSnapshotTests.xctest"
+               BlueprintName = "PokemonGuiderSnapshotTests"
+               ReferencedContainer = "container:PokemonGuider.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </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">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuiderTests.xcscheme b/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuiderTests.xcscheme
new file mode 100644
index 0000000..6adafd5
--- /dev/null
+++ b/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuiderTests.xcscheme
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1E6EAC242B899975004CC1D2"
+               BuildableName = "PokemonGuiderTests.xctest"
+               BlueprintName = "PokemonGuiderTests"
+               ReferencedContainer = "container:PokemonGuider.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </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">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuiderUITests.xcscheme b/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuiderUITests.xcscheme
new file mode 100644
index 0000000..1eb5777
--- /dev/null
+++ b/PokemonGuider.xcodeproj/xcshareddata/xcschemes/PokemonGuiderUITests.xcscheme
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1E37DD532B8F1A1400045F6A"
+               BuildableName = "PokemonGuiderUITests.xctest"
+               BlueprintName = "PokemonGuiderUITests"
+               ReferencedContainer = "container:PokemonGuider.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </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">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>