diff --git a/aws/sdk/examples/mediapackage-listendpoints/Cargo.toml b/aws/sdk/examples/mediapackage-listendpoints/Cargo.toml
deleted file mode 100644
index 0842202f04..0000000000
--- a/aws/sdk/examples/mediapackage-listendpoints/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "mediapackage-listendpoints"
-version = "0.1.0"
-authors = ["Alistair McLean <mclean@amazon.com>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-mediapackage = { package = "aws-sdk-mediapackage", path = "../../build/aws-sdk/mediapackage" }
-### To use native TLS:
-# mediapackage = { package = "aws-sdk-mediapackage", path = "../../build/aws-sdk/mediapackage", default-features = false, features = ["native-tls"] }
-tokio = { version = "1", features = ["full"] }
-# used only to enable basic logging:
-env_logger = "0.8.2"
\ No newline at end of file
diff --git a/aws/sdk/examples/mediapackage-helloworld/Cargo.toml b/aws/sdk/examples/mediapackage/Cargo.toml
similarity index 58%
rename from aws/sdk/examples/mediapackage-helloworld/Cargo.toml
rename to aws/sdk/examples/mediapackage/Cargo.toml
index ed34c9bf00..6661f027a0 100644
--- a/aws/sdk/examples/mediapackage-helloworld/Cargo.toml
+++ b/aws/sdk/examples/mediapackage/Cargo.toml
@@ -1,15 +1,13 @@
 [package]
-name = "mediapackage-helloworld"
+name = "mediapackage-code-examples"
 version = "0.1.0"
-authors = ["Alistair McLean <mclean@amazon.com>"]
+authors = ["Alistair McLean <mclean@amazon.com>", "Doug Schwartz <dougsch@amazon.com>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 mediapackage = { package = "aws-sdk-mediapackage", path = "../../build/aws-sdk/mediapackage" }
-### To use native TLS:
-# mediapackage = { package = "aws-sdk-mediapackage", path = "../../build/aws-sdk/mediapackage", default-features = false, features = ["native-tls"] }
 tokio = { version = "1", features = ["full"] }
 # used only to enable basic logging:
 env_logger = "0.8.2"
\ No newline at end of file
diff --git a/aws/sdk/examples/mediapackage-listendpoints/src/main.rs b/aws/sdk/examples/mediapackage/src/bin/list-endpoints.rs
similarity index 92%
rename from aws/sdk/examples/mediapackage-listendpoints/src/main.rs
rename to aws/sdk/examples/mediapackage/src/bin/list-endpoints.rs
index f6ffa02ec0..3f96b5d1ea 100644
--- a/aws/sdk/examples/mediapackage-listendpoints/src/main.rs
+++ b/aws/sdk/examples/mediapackage/src/bin/list-endpoints.rs
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
+/// Lists your AWS Elemental MediaPackage endpoint URLs.
 #[tokio::main]
 async fn main() -> Result<(), mediapackage::Error> {
     let client = mediapackage::Client::from_env();
diff --git a/aws/sdk/examples/mediapackage-helloworld/src/main.rs b/aws/sdk/examples/mediapackage/src/bin/mediapackage-helloworld.rs
similarity index 87%
rename from aws/sdk/examples/mediapackage-helloworld/src/main.rs
rename to aws/sdk/examples/mediapackage/src/bin/mediapackage-helloworld.rs
index 1b3f4ae04c..c4c38eaf4f 100644
--- a/aws/sdk/examples/mediapackage-helloworld/src/main.rs
+++ b/aws/sdk/examples/mediapackage/src/bin/mediapackage-helloworld.rs
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
+/// Lists your AWS Elemental MediaPackage channel ARNs and descriptions.
 #[tokio::main]
 async fn main() -> Result<(), mediapackage::Error> {
     let client = mediapackage::Client::from_env();
     let list_channels = client.list_channels().send().await?;
 
-    // List out all the mediapackage channels and display their ARN and description.
     for c in list_channels.channels.unwrap_or_default() {
         let description = c.description.as_deref().unwrap_or_default();
         let arn = c.arn.as_deref().unwrap_or_default();