diff --git a/code_sharing/server/Dockerfile b/code_sharing/Dockerfile
similarity index 72%
rename from code_sharing/server/Dockerfile
rename to code_sharing/Dockerfile
index f07aec295..f41dc30c6 100644
--- a/code_sharing/server/Dockerfile
+++ b/code_sharing/Dockerfile
@@ -1,9 +1,15 @@
 # Use latest stable channel SDK.
 FROM dart:stable AS build
 
+# Copy shared code.
+WORKDIR /shared
+COPY /shared/. .
+
+# Copy server code.
+WORKDIR /server
+COPY /server/. .
+
 # Resolve app dependencies.
-WORKDIR /app
-COPY . .
 RUN dart pub get
 
 # AOT compile app.
@@ -13,7 +19,7 @@ RUN dart compile exe bin/server.dart -o bin/server
 # and the pre-built AOT-runtime in the `/runtime/` directory of the base image.
 FROM scratch
 COPY --from=build /runtime/ /
-COPY --from=build /app/bin/server /app/bin/
+COPY --from=build /server/bin/server /app/bin/
 
 # Start server.
 EXPOSE 8080
diff --git a/code_sharing/Makefile b/code_sharing/Makefile
index faf874bbe..22aecc54d 100644
--- a/code_sharing/Makefile
+++ b/code_sharing/Makefile
@@ -19,6 +19,6 @@ test:
 
 # Docker
 build:
-	(cd server && flutter pub get)
-	docker build ./server -t codesharingserver -f server/Dockerfile
+	(cd server && dart pub get)
+	docker build . -t codesharingserver
 
diff --git a/code_sharing/README.md b/code_sharing/README.md
index 5c7187357..f11edba49 100644
--- a/code_sharing/README.md
+++ b/code_sharing/README.md
@@ -32,13 +32,13 @@ code_sharing/
   server/
     bin/
       server.dart
-    # Common business logic
-    shared/
-      pubspec.yaml
-      lib/
-        ...
     pubspec.yaml
     Dockerfile
+  # Common business logic
+  shared/
+    pubspec.yaml
+    lib/
+      ...
 ```
 
 ## Recreating this on your own
diff --git a/code_sharing/client/lib/main.dart b/code_sharing/client/lib/main.dart
index e96b52fc9..f9a97b348 100644
--- a/code_sharing/client/lib/main.dart
+++ b/code_sharing/client/lib/main.dart
@@ -78,7 +78,11 @@ class _MyHomePageState extends State<MyHomePage> {
           (int val) => setState(
             () {
               _counter = val;
-              isWriting = true;
+              // Leave this up for at least a split second
+              Future.delayed(
+                const Duration(milliseconds: 200),
+                () => setState(() => isWriting = false),
+              );
             },
           ),
         );
diff --git a/code_sharing/client/pubspec.yaml b/code_sharing/client/pubspec.yaml
index f46c1210c..8897d18b4 100644
--- a/code_sharing/client/pubspec.yaml
+++ b/code_sharing/client/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
   http: ^0.13.5
   shared:
-    path: ../server/shared
+    path: ../shared
 
 dev_dependencies:
   flutter_lints: ^2.0.0
diff --git a/code_sharing/docker-compose.yml b/code_sharing/docker-compose.yml
index bf378f004..e38c622b2 100644
--- a/code_sharing/docker-compose.yml
+++ b/code_sharing/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   server:
     build:
-      context: server
+      context: .
     ports:
       - 8080:8080
     environment:
diff --git a/code_sharing/server/.dockerignore b/code_sharing/server/.dockerignore
index 21504f8fe..7d51f93ae 100644
--- a/code_sharing/server/.dockerignore
+++ b/code_sharing/server/.dockerignore
@@ -1,9 +1,12 @@
 .dockerignore
 Dockerfile
-build/
-.dart_tool/
+docker-compose.yml
+Makefile
+README.md
+*/build/
+*/.dart_tool/
 .git/
 .github/
 .gitignore
-.idea/
-.packages
+*/.idea/
+*/.packages
diff --git a/code_sharing/server/pubspec.yaml b/code_sharing/server/pubspec.yaml
index d89bbeedd..0641e64f9 100644
--- a/code_sharing/server/pubspec.yaml
+++ b/code_sharing/server/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   shelf: ^1.1.0
   shelf_router: ^1.0.0
   shared:
-    path: ./shared
+    path: ../shared
 
 dev_dependencies:
   http: ^0.13.0
diff --git a/code_sharing/server/shared/.gitignore b/code_sharing/shared/.gitignore
similarity index 100%
rename from code_sharing/server/shared/.gitignore
rename to code_sharing/shared/.gitignore
diff --git a/code_sharing/server/shared/CHANGELOG.md b/code_sharing/shared/CHANGELOG.md
similarity index 100%
rename from code_sharing/server/shared/CHANGELOG.md
rename to code_sharing/shared/CHANGELOG.md
diff --git a/code_sharing/server/shared/README.md b/code_sharing/shared/README.md
similarity index 100%
rename from code_sharing/server/shared/README.md
rename to code_sharing/shared/README.md
diff --git a/code_sharing/server/shared/analysis_options.yaml b/code_sharing/shared/analysis_options.yaml
similarity index 100%
rename from code_sharing/server/shared/analysis_options.yaml
rename to code_sharing/shared/analysis_options.yaml
diff --git a/code_sharing/server/shared/lib/shared.dart b/code_sharing/shared/lib/shared.dart
similarity index 100%
rename from code_sharing/server/shared/lib/shared.dart
rename to code_sharing/shared/lib/shared.dart
diff --git a/code_sharing/server/shared/lib/src/models.dart b/code_sharing/shared/lib/src/models.dart
similarity index 100%
rename from code_sharing/server/shared/lib/src/models.dart
rename to code_sharing/shared/lib/src/models.dart
diff --git a/code_sharing/server/shared/lib/src/models.freezed.dart b/code_sharing/shared/lib/src/models.freezed.dart
similarity index 100%
rename from code_sharing/server/shared/lib/src/models.freezed.dart
rename to code_sharing/shared/lib/src/models.freezed.dart
diff --git a/code_sharing/server/shared/lib/src/models.g.dart b/code_sharing/shared/lib/src/models.g.dart
similarity index 100%
rename from code_sharing/server/shared/lib/src/models.g.dart
rename to code_sharing/shared/lib/src/models.g.dart
diff --git a/code_sharing/server/shared/pubspec.yaml b/code_sharing/shared/pubspec.yaml
similarity index 100%
rename from code_sharing/server/shared/pubspec.yaml
rename to code_sharing/shared/pubspec.yaml
diff --git a/code_sharing/server/shared/test/shared_test.dart b/code_sharing/shared/test/shared_test.dart
similarity index 100%
rename from code_sharing/server/shared/test/shared_test.dart
rename to code_sharing/shared/test/shared_test.dart
diff --git a/tool/flutter_ci_script_beta.sh b/tool/flutter_ci_script_beta.sh
index 5457b0ecc..e9ebc70e1 100755
--- a/tool/flutter_ci_script_beta.sh
+++ b/tool/flutter_ci_script_beta.sh
@@ -17,7 +17,7 @@ declare -ar PROJECT_NAMES=(
     "animations"
     "code_sharing/client"
     "code_sharing/server"
-    "code_sharing/server/shared"
+    "code_sharing/shared"
     "desktop_photo_search/fluent_ui"
     "desktop_photo_search/material"
     "experimental/federated_plugin/federated_plugin"