diff --git a/client/.metadata b/.metadata
similarity index 100%
rename from client/.metadata
rename to .metadata
diff --git a/client/README.md b/README.md
similarity index 100%
rename from client/README.md
rename to README.md
diff --git a/client/analysis_options.yaml b/analysis_options.yaml
similarity index 100%
rename from client/analysis_options.yaml
rename to analysis_options.yaml
diff --git a/client/android/.gitignore b/android/.gitignore
similarity index 100%
rename from client/android/.gitignore
rename to android/.gitignore
diff --git a/client/android/app/build.gradle b/android/app/build.gradle
similarity index 100%
rename from client/android/app/build.gradle
rename to android/app/build.gradle
diff --git a/client/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
similarity index 100%
rename from client/android/app/src/debug/AndroidManifest.xml
rename to android/app/src/debug/AndroidManifest.xml
diff --git a/client/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from client/android/app/src/main/AndroidManifest.xml
rename to android/app/src/main/AndroidManifest.xml
diff --git a/client/android/app/src/main/kotlin/dev/zontreck/servermanager/MainActivity.kt b/android/app/src/main/kotlin/dev/zontreck/servermanager/MainActivity.kt
similarity index 100%
rename from client/android/app/src/main/kotlin/dev/zontreck/servermanager/MainActivity.kt
rename to android/app/src/main/kotlin/dev/zontreck/servermanager/MainActivity.kt
diff --git a/client/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
similarity index 100%
rename from client/android/app/src/main/res/drawable-v21/launch_background.xml
rename to android/app/src/main/res/drawable-v21/launch_background.xml
diff --git a/client/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
similarity index 100%
rename from client/android/app/src/main/res/drawable/launch_background.xml
rename to android/app/src/main/res/drawable/launch_background.xml
diff --git a/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/client/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
similarity index 100%
rename from client/android/app/src/main/res/values-night/styles.xml
rename to android/app/src/main/res/values-night/styles.xml
diff --git a/client/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
similarity index 100%
rename from client/android/app/src/main/res/values/styles.xml
rename to android/app/src/main/res/values/styles.xml
diff --git a/client/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
similarity index 100%
rename from client/android/app/src/profile/AndroidManifest.xml
rename to android/app/src/profile/AndroidManifest.xml
diff --git a/client/android/build.gradle b/android/build.gradle
similarity index 100%
rename from client/android/build.gradle
rename to android/build.gradle
diff --git a/client/android/gradle.properties b/android/gradle.properties
similarity index 100%
rename from client/android/gradle.properties
rename to android/gradle.properties
diff --git a/client/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from client/android/gradle/wrapper/gradle-wrapper.properties
rename to android/gradle/wrapper/gradle-wrapper.properties
diff --git a/client/android/settings.gradle b/android/settings.gradle
similarity index 100%
rename from client/android/settings.gradle
rename to android/settings.gradle
diff --git a/client/compile.bat b/compile.bat
similarity index 100%
rename from client/compile.bat
rename to compile.bat
diff --git a/client/compile.sh b/compile.sh
similarity index 100%
rename from client/compile.sh
rename to compile.sh
diff --git a/client/ios/.gitignore b/ios/.gitignore
similarity index 100%
rename from client/ios/.gitignore
rename to ios/.gitignore
diff --git a/client/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
similarity index 100%
rename from client/ios/Flutter/AppFrameworkInfo.plist
rename to ios/Flutter/AppFrameworkInfo.plist
diff --git a/client/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
similarity index 100%
rename from client/ios/Flutter/Debug.xcconfig
rename to ios/Flutter/Debug.xcconfig
diff --git a/client/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig
similarity index 100%
rename from client/ios/Flutter/Release.xcconfig
rename to ios/Flutter/Release.xcconfig
diff --git a/client/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
similarity index 100%
rename from client/ios/Runner.xcodeproj/project.pbxproj
rename to ios/Runner.xcodeproj/project.pbxproj
diff --git a/client/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from client/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/client/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from client/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/client/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
similarity index 100%
rename from client/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
rename to ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/client/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
similarity index 100%
rename from client/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
rename to ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/client/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from client/ios/Runner.xcworkspace/contents.xcworkspacedata
rename to ios/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/client/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from client/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/client/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
similarity index 100%
rename from client/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
rename to ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/client/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
similarity index 100%
rename from client/ios/Runner/AppDelegate.swift
rename to ios/Runner/AppDelegate.swift
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
diff --git a/client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
diff --git a/client/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
rename to ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
diff --git a/client/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
rename to ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
diff --git a/client/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
rename to ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
diff --git a/client/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
rename to ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
diff --git a/client/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
similarity index 100%
rename from client/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
rename to ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
diff --git a/client/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from client/ios/Runner/Base.lproj/LaunchScreen.storyboard
rename to ios/Runner/Base.lproj/LaunchScreen.storyboard
diff --git a/client/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard
similarity index 100%
rename from client/ios/Runner/Base.lproj/Main.storyboard
rename to ios/Runner/Base.lproj/Main.storyboard
diff --git a/client/ios/Runner/Info.plist b/ios/Runner/Info.plist
similarity index 100%
rename from client/ios/Runner/Info.plist
rename to ios/Runner/Info.plist
diff --git a/client/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h
similarity index 100%
rename from client/ios/Runner/Runner-Bridging-Header.h
rename to ios/Runner/Runner-Bridging-Header.h
diff --git a/client/ios/RunnerTests/RunnerTests.swift b/ios/RunnerTests/RunnerTests.swift
similarity index 100%
rename from client/ios/RunnerTests/RunnerTests.swift
rename to ios/RunnerTests/RunnerTests.swift
diff --git a/client/lib/Constants.dart b/lib/Constants.dart
similarity index 100%
rename from client/lib/Constants.dart
rename to lib/Constants.dart
diff --git a/client/lib/autorestart.dart b/lib/autorestart.dart
similarity index 100%
rename from client/lib/autorestart.dart
rename to lib/autorestart.dart
diff --git a/client/lib/credentials.dart b/lib/credentials.dart
similarity index 100%
rename from client/lib/credentials.dart
rename to lib/credentials.dart
diff --git a/client/lib/dialogbox.dart b/lib/dialogbox.dart
similarity index 100%
rename from client/lib/dialogbox.dart
rename to lib/dialogbox.dart
diff --git a/client/lib/game.dart b/lib/game.dart
similarity index 100%
rename from client/lib/game.dart
rename to lib/game.dart
diff --git a/client/lib/home.dart b/lib/home.dart
similarity index 100%
rename from client/lib/home.dart
rename to lib/home.dart
diff --git a/client/lib/main.dart b/lib/main.dart
similarity index 100%
rename from client/lib/main.dart
rename to lib/main.dart
diff --git a/client/lib/mod.dart b/lib/mod.dart
similarity index 100%
rename from client/lib/mod.dart
rename to lib/mod.dart
diff --git a/client/lib/packets/ClientPackets.dart b/lib/packets/ClientPackets.dart
similarity index 100%
rename from client/lib/packets/ClientPackets.dart
rename to lib/packets/ClientPackets.dart
diff --git a/client/lib/proton.dart b/lib/proton.dart
similarity index 100%
rename from client/lib/proton.dart
rename to lib/proton.dart
diff --git a/client/lib/serversettings.dart b/lib/serversettings.dart
similarity index 100%
rename from client/lib/serversettings.dart
rename to lib/serversettings.dart
diff --git a/client/lib/settings.dart b/lib/settings.dart
similarity index 100%
rename from client/lib/settings.dart
rename to lib/settings.dart
diff --git a/client/lib/settingsEntry.dart b/lib/settingsEntry.dart
similarity index 100%
rename from client/lib/settingsEntry.dart
rename to lib/settingsEntry.dart
diff --git a/client/lib/statemachine.dart b/lib/statemachine.dart
similarity index 100%
rename from client/lib/statemachine.dart
rename to lib/statemachine.dart
diff --git a/client/lib/steamcmd.dart b/lib/steamcmd.dart
similarity index 100%
rename from client/lib/steamcmd.dart
rename to lib/steamcmd.dart
diff --git a/client/linux/.gitignore b/linux/.gitignore
similarity index 100%
rename from client/linux/.gitignore
rename to linux/.gitignore
diff --git a/client/linux/CMakeLists.txt b/linux/CMakeLists.txt
similarity index 100%
rename from client/linux/CMakeLists.txt
rename to linux/CMakeLists.txt
diff --git a/client/linux/flutter/CMakeLists.txt b/linux/flutter/CMakeLists.txt
similarity index 100%
rename from client/linux/flutter/CMakeLists.txt
rename to linux/flutter/CMakeLists.txt
diff --git a/client/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
similarity index 100%
rename from client/linux/flutter/generated_plugin_registrant.cc
rename to linux/flutter/generated_plugin_registrant.cc
diff --git a/client/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h
similarity index 100%
rename from client/linux/flutter/generated_plugin_registrant.h
rename to linux/flutter/generated_plugin_registrant.h
diff --git a/client/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
similarity index 100%
rename from client/linux/flutter/generated_plugins.cmake
rename to linux/flutter/generated_plugins.cmake
diff --git a/client/linux/main.cc b/linux/main.cc
similarity index 100%
rename from client/linux/main.cc
rename to linux/main.cc
diff --git a/client/linux/my_application.cc b/linux/my_application.cc
similarity index 100%
rename from client/linux/my_application.cc
rename to linux/my_application.cc
diff --git a/client/linux/my_application.h b/linux/my_application.h
similarity index 100%
rename from client/linux/my_application.h
rename to linux/my_application.h
diff --git a/client/macos/.gitignore b/macos/.gitignore
similarity index 100%
rename from client/macos/.gitignore
rename to macos/.gitignore
diff --git a/client/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig
similarity index 100%
rename from client/macos/Flutter/Flutter-Debug.xcconfig
rename to macos/Flutter/Flutter-Debug.xcconfig
diff --git a/client/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig
similarity index 100%
rename from client/macos/Flutter/Flutter-Release.xcconfig
rename to macos/Flutter/Flutter-Release.xcconfig
diff --git a/client/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
similarity index 100%
rename from client/macos/Flutter/GeneratedPluginRegistrant.swift
rename to macos/Flutter/GeneratedPluginRegistrant.swift
diff --git a/client/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
similarity index 100%
rename from client/macos/Runner.xcodeproj/project.pbxproj
rename to macos/Runner.xcodeproj/project.pbxproj
diff --git a/client/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from client/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/client/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
similarity index 100%
rename from client/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
rename to macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/client/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from client/macos/Runner.xcworkspace/contents.xcworkspacedata
rename to macos/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/client/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from client/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/client/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift
similarity index 100%
rename from client/macos/Runner/AppDelegate.swift
rename to macos/Runner/AppDelegate.swift
diff --git a/client/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from client/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
similarity index 100%
rename from client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
diff --git a/client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
similarity index 100%
rename from client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
diff --git a/client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
similarity index 100%
rename from client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
diff --git a/client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
similarity index 100%
rename from client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
diff --git a/client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
similarity index 100%
rename from client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
diff --git a/client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
similarity index 100%
rename from client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
diff --git a/client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
similarity index 100%
rename from client/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
diff --git a/client/macos/Runner/Base.lproj/MainMenu.xib b/macos/Runner/Base.lproj/MainMenu.xib
similarity index 100%
rename from client/macos/Runner/Base.lproj/MainMenu.xib
rename to macos/Runner/Base.lproj/MainMenu.xib
diff --git a/client/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig
similarity index 100%
rename from client/macos/Runner/Configs/AppInfo.xcconfig
rename to macos/Runner/Configs/AppInfo.xcconfig
diff --git a/client/macos/Runner/Configs/Debug.xcconfig b/macos/Runner/Configs/Debug.xcconfig
similarity index 100%
rename from client/macos/Runner/Configs/Debug.xcconfig
rename to macos/Runner/Configs/Debug.xcconfig
diff --git a/client/macos/Runner/Configs/Release.xcconfig b/macos/Runner/Configs/Release.xcconfig
similarity index 100%
rename from client/macos/Runner/Configs/Release.xcconfig
rename to macos/Runner/Configs/Release.xcconfig
diff --git a/client/macos/Runner/Configs/Warnings.xcconfig b/macos/Runner/Configs/Warnings.xcconfig
similarity index 100%
rename from client/macos/Runner/Configs/Warnings.xcconfig
rename to macos/Runner/Configs/Warnings.xcconfig
diff --git a/client/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfile.entitlements
similarity index 100%
rename from client/macos/Runner/DebugProfile.entitlements
rename to macos/Runner/DebugProfile.entitlements
diff --git a/client/macos/Runner/Info.plist b/macos/Runner/Info.plist
similarity index 100%
rename from client/macos/Runner/Info.plist
rename to macos/Runner/Info.plist
diff --git a/client/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift
similarity index 100%
rename from client/macos/Runner/MainFlutterWindow.swift
rename to macos/Runner/MainFlutterWindow.swift
diff --git a/client/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements
similarity index 100%
rename from client/macos/Runner/Release.entitlements
rename to macos/Runner/Release.entitlements
diff --git a/client/macos/RunnerTests/RunnerTests.swift b/macos/RunnerTests/RunnerTests.swift
similarity index 100%
rename from client/macos/RunnerTests/RunnerTests.swift
rename to macos/RunnerTests/RunnerTests.swift
diff --git a/client/pubspec.yaml b/pubspec.yaml
similarity index 100%
rename from client/pubspec.yaml
rename to pubspec.yaml
diff --git a/client/run_hive_generator.bat b/run_hive_generator.bat
similarity index 100%
rename from client/run_hive_generator.bat
rename to run_hive_generator.bat
diff --git a/client/run_hive_generator.sh b/run_hive_generator.sh
similarity index 100%
rename from client/run_hive_generator.sh
rename to run_hive_generator.sh
diff --git a/server/.gitignore b/server/.gitignore
deleted file mode 100644
index 3a85790..0000000
--- a/server/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# https://dart.dev/guides/libraries/private-files
-# Created by `dart pub`
-.dart_tool/
diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md
deleted file mode 100644
index effe43c..0000000
--- a/server/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.0
-
-- Initial version.
diff --git a/server/README.md b/server/README.md
deleted file mode 100644
index 3816eca..0000000
--- a/server/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-A sample command-line application with an entrypoint in `bin/`, library code
-in `lib/`, and example unit test in `test/`.
diff --git a/server/analysis_options.yaml b/server/analysis_options.yaml
deleted file mode 100644
index dee8927..0000000
--- a/server/analysis_options.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file configures the static analysis results for your project (errors,
-# warnings, and lints).
-#
-# This enables the 'recommended' set of lints from `package:lints`.
-# This set helps identify many issues that may lead to problems when running
-# or consuming Dart code, and enforces writing Dart using a single, idiomatic
-# style and format.
-#
-# If you want a smaller set of lints you can change this to specify
-# 'package:lints/core.yaml'. These are just the most critical lints
-# (the recommended set includes the core lints).
-# The core lints are also what is used by pub.dev for scoring packages.
-
-include: package:lints/recommended.yaml
-
-# Uncomment the following section to specify additional rules.
-
-# linter:
-#   rules:
-#     - camel_case_types
-
-# analyzer:
-#   exclude:
-#     - path/to/excluded/files/**
-
-# For more information about the core and recommended set of lints, see
-# https://dart.dev/go/core-lints
-
-# For additional information about configuring this file, see
-# https://dart.dev/guides/language/analysis-options
diff --git a/server/bin/server.dart b/server/bin/server.dart
deleted file mode 100644
index b145cc5..0000000
--- a/server/bin/server.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'package:server/server.dart' as server;
-
-void main(List<String> arguments) {
-  print('Hello world: ${server.calculate()}!');
-}
diff --git a/server/lib/server.dart b/server/lib/server.dart
deleted file mode 100644
index f64ad72..0000000
--- a/server/lib/server.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-int calculate() {
-  return 6 * 7;
-}
diff --git a/server/pubspec.yaml b/server/pubspec.yaml
deleted file mode 100644
index b624120..0000000
--- a/server/pubspec.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: server
-description: A sample command-line application.
-version: 1.0.0
-# repository: https://github.com/my_org/my_repo
-
-environment:
-  sdk: ^3.4.0
-
-# Add regular dependencies here.
-dependencies:
-  libac_flutter:
-    hosted: https://git.zontreck.com/api/packages/AriasCreations/pub/
-    version: 1.0.6
-  # path: ^1.8.0
-
-dev_dependencies:
-  lints: ^3.0.0
-  test: ^1.24.0
diff --git a/server/test/server_test.dart b/server/test/server_test.dart
deleted file mode 100644
index 46bb50b..0000000
--- a/server/test/server_test.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-import 'package:server/server.dart';
-import 'package:test/test.dart';
-
-void main() {
-  test('calculate', () {
-    expect(calculate(), 42);
-  });
-}
diff --git a/client/web/favicon.png b/web/favicon.png
similarity index 100%
rename from client/web/favicon.png
rename to web/favicon.png
diff --git a/client/web/icons/Icon-192.png b/web/icons/Icon-192.png
similarity index 100%
rename from client/web/icons/Icon-192.png
rename to web/icons/Icon-192.png
diff --git a/client/web/icons/Icon-512.png b/web/icons/Icon-512.png
similarity index 100%
rename from client/web/icons/Icon-512.png
rename to web/icons/Icon-512.png
diff --git a/client/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png
similarity index 100%
rename from client/web/icons/Icon-maskable-192.png
rename to web/icons/Icon-maskable-192.png
diff --git a/client/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png
similarity index 100%
rename from client/web/icons/Icon-maskable-512.png
rename to web/icons/Icon-maskable-512.png
diff --git a/client/web/index.html b/web/index.html
similarity index 100%
rename from client/web/index.html
rename to web/index.html
diff --git a/client/web/manifest.json b/web/manifest.json
similarity index 100%
rename from client/web/manifest.json
rename to web/manifest.json
diff --git a/client/windows/.gitignore b/windows/.gitignore
similarity index 100%
rename from client/windows/.gitignore
rename to windows/.gitignore
diff --git a/client/windows/CMakeLists.txt b/windows/CMakeLists.txt
similarity index 100%
rename from client/windows/CMakeLists.txt
rename to windows/CMakeLists.txt
diff --git a/client/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt
similarity index 100%
rename from client/windows/flutter/CMakeLists.txt
rename to windows/flutter/CMakeLists.txt
diff --git a/client/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
similarity index 100%
rename from client/windows/flutter/generated_plugin_registrant.cc
rename to windows/flutter/generated_plugin_registrant.cc
diff --git a/client/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h
similarity index 100%
rename from client/windows/flutter/generated_plugin_registrant.h
rename to windows/flutter/generated_plugin_registrant.h
diff --git a/client/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
similarity index 100%
rename from client/windows/flutter/generated_plugins.cmake
rename to windows/flutter/generated_plugins.cmake
diff --git a/client/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt
similarity index 100%
rename from client/windows/runner/CMakeLists.txt
rename to windows/runner/CMakeLists.txt
diff --git a/client/windows/runner/Runner.rc b/windows/runner/Runner.rc
similarity index 100%
rename from client/windows/runner/Runner.rc
rename to windows/runner/Runner.rc
diff --git a/client/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp
similarity index 100%
rename from client/windows/runner/flutter_window.cpp
rename to windows/runner/flutter_window.cpp
diff --git a/client/windows/runner/flutter_window.h b/windows/runner/flutter_window.h
similarity index 100%
rename from client/windows/runner/flutter_window.h
rename to windows/runner/flutter_window.h
diff --git a/client/windows/runner/main.cpp b/windows/runner/main.cpp
similarity index 100%
rename from client/windows/runner/main.cpp
rename to windows/runner/main.cpp
diff --git a/client/windows/runner/resource.h b/windows/runner/resource.h
similarity index 100%
rename from client/windows/runner/resource.h
rename to windows/runner/resource.h
diff --git a/client/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico
similarity index 100%
rename from client/windows/runner/resources/app_icon.ico
rename to windows/runner/resources/app_icon.ico
diff --git a/client/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest
similarity index 100%
rename from client/windows/runner/runner.exe.manifest
rename to windows/runner/runner.exe.manifest
diff --git a/client/windows/runner/utils.cpp b/windows/runner/utils.cpp
similarity index 100%
rename from client/windows/runner/utils.cpp
rename to windows/runner/utils.cpp
diff --git a/client/windows/runner/utils.h b/windows/runner/utils.h
similarity index 100%
rename from client/windows/runner/utils.h
rename to windows/runner/utils.h
diff --git a/client/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp
similarity index 100%
rename from client/windows/runner/win32_window.cpp
rename to windows/runner/win32_window.cpp
diff --git a/client/windows/runner/win32_window.h b/windows/runner/win32_window.h
similarity index 100%
rename from client/windows/runner/win32_window.h
rename to windows/runner/win32_window.h