diff --git a/wpilibcExamples/src/main/cpp/examples/examples.xml b/wpilibcExamples/examples.xml
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/examples.xml
rename to wpilibcExamples/examples.xml
diff --git a/wpilibcExamples/publish.gradle b/wpilibcExamples/publish.gradle
index 16ca7002f4..48913b395f 100644
--- a/wpilibcExamples/publish.gradle
+++ b/wpilibcExamples/publish.gradle
@@ -31,6 +31,10 @@ task cppExamplesZip(type: Zip) {
     from('src/main/cpp/examples') {
         into 'examples'
     }
+
+    from ('examples.xml') {
+        into 'examples'
+    }
 }
 
 task cppTemplatesZip(type: Zip) {
diff --git a/wpilibjExamples/examples.xml b/wpilibjExamples/examples.xml
index 213286b807..ca8d8c66a6 100755
--- a/wpilibjExamples/examples.xml
+++ b/wpilibjExamples/examples.xml
@@ -85,7 +85,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/GettingStarted/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/gettingstarted/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
     <example>
@@ -102,7 +102,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/TankDrive/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/tankdrive/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
     <example>
@@ -119,7 +119,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/MecanumDrive/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/mecanumdrive/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
     <example>
@@ -134,7 +134,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/Ultrasonic/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/ultrasonic/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
     <example>
@@ -150,7 +150,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/UltrasonicPID/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/ultrasonicpid/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
     <example>
@@ -167,7 +167,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/PotentiometerPID/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/potentiometerpid/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
     <example>
@@ -183,7 +183,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/Gyro/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/gyro/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
     <example>
@@ -200,7 +200,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/GyroMecanum/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/gyromecanum/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
     <example>
@@ -215,7 +215,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/MotorControl/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/motorcontrol/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
     <example>
@@ -232,23 +232,23 @@
             <package>src/$package-dir/subsystems</package>
         </packages>
         <files>
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/OI.java" destination="src/$package-dir/OI.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/commands/Autonomous.java" destination="src/$package-dir/commands/Autonomous.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/commands/CloseClaw.java" destination="src/$package-dir/commands/CloseClaw.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/commands/DriveStraight.java" destination="src/$package-dir/commands/DriveStraight.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/commands/OpenClaw.java" destination="src/$package-dir/commands/OpenClaw.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/commands/Pickup.java" destination="src/$package-dir/commands/Pickup.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/commands/Place.java" destination="src/$package-dir/commands/Place.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/commands/PrepareToPickup.java" destination="src/$package-dir/commands/PrepareToPickup.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/commands/SetDistanceToBox.java" destination="src/$package-dir/commands/SetDistanceToBox.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/commands/SetElevatorSetpoint.java" destination="src/$package-dir/commands/SetElevatorSetpoint.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/commands/SetWristSetpoint.java" destination="src/$package-dir/commands/SetWristSetpoint.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/commands/TankDriveWithJoystick.java" destination="src/$package-dir/commands/TankDriveWithJoystick.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/subsystems/Claw.java" destination="src/$package-dir/subsystems/Claw.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/subsystems/DriveTrain.java" destination="src/$package-dir/subsystems/DriveTrain.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/subsystems/Elevator.java" destination="src/$package-dir/subsystems/Elevator.java" />
-            <file source="examples/GearsBot/src/org/usfirst/frc/team190/robot/subsystems/Wrist.java" destination="src/$package-dir/subsystems/Wrist.java" />
+            <file source="examples/gearsbot/OI.java" destination="src/$package-dir/OI.java" />
+            <file source="examples/gearsbot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/gearsbot/commands/Autonomous.java" destination="src/$package-dir/commands/Autonomous.java" />
+            <file source="examples/gearsbot/commands/CloseClaw.java" destination="src/$package-dir/commands/CloseClaw.java" />
+            <file source="examples/gearsbot/commands/DriveStraight.java" destination="src/$package-dir/commands/DriveStraight.java" />
+            <file source="examples/gearsbot/commands/OpenClaw.java" destination="src/$package-dir/commands/OpenClaw.java" />
+            <file source="examples/gearsbot/commands/Pickup.java" destination="src/$package-dir/commands/Pickup.java" />
+            <file source="examples/gearsbot/commands/Place.java" destination="src/$package-dir/commands/Place.java" />
+            <file source="examples/gearsbot/commands/PrepareToPickup.java" destination="src/$package-dir/commands/PrepareToPickup.java" />
+            <file source="examples/gearsbot/commands/SetDistanceToBox.java" destination="src/$package-dir/commands/SetDistanceToBox.java" />
+            <file source="examples/gearsbot/commands/SetElevatorSetpoint.java" destination="src/$package-dir/commands/SetElevatorSetpoint.java" />
+            <file source="examples/gearsbot/commands/SetWristSetpoint.java" destination="src/$package-dir/commands/SetWristSetpoint.java" />
+            <file source="examples/gearsbot/commands/TankDriveWithJoystick.java" destination="src/$package-dir/commands/TankDriveWithJoystick.java" />
+            <file source="examples/gearsbot/subsystems/Claw.java" destination="src/$package-dir/subsystems/Claw.java" />
+            <file source="examples/gearsbot/subsystems/DriveTrain.java" destination="src/$package-dir/subsystems/DriveTrain.java" />
+            <file source="examples/gearsbot/subsystems/Elevator.java" destination="src/$package-dir/subsystems/Elevator.java" />
+            <file source="examples/gearsbot/subsystems/Wrist.java" destination="src/$package-dir/subsystems/Wrist.java" />
         </files>
     </example>
     <example>
@@ -263,7 +263,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/QuickVision/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/quickvision/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
     <example>
@@ -278,7 +278,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/IntermediateVision/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/intermediatevision/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
     <example>
@@ -295,7 +295,7 @@
             <package>src/$package-dir</package>
         </packages>
         <files>
-            <file source="examples/AxisCameraSample/src/org/usfirst/frc/team190/robot/Robot.java" destination="src/$package-dir/Robot.java" />
+            <file source="examples/axiscamera/Robot.java" destination="src/$package-dir/Robot.java" />
         </files>
     </example>
 </examples>
diff --git a/wpilibjExamples/publish.gradle b/wpilibjExamples/publish.gradle
index d0e4f3244b..559585fcba 100644
--- a/wpilibjExamples/publish.gradle
+++ b/wpilibjExamples/publish.gradle
@@ -31,6 +31,10 @@ task javaExamplesZip(type: Zip) {
     from('src/main/java/edu/wpi/first/wpilibj/examples') {
         into 'examples'
     }
+
+    from ('examples.xml') {
+        into 'examples'
+    }
 }
 
 task javaTemplatesZip(type: Zip) {
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/vision/axiscamera/Robot.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/axiscamera/Robot.java
old mode 100755
new mode 100644
similarity index 97%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/vision/axiscamera/Robot.java
rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/axiscamera/Robot.java
index 47e28295ae..33d48db042
--- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/vision/axiscamera/Robot.java
+++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/axiscamera/Robot.java
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.examples.vision.axiscamera;
+package edu.wpi.first.wpilibj.examples.axiscamera;
 
 import edu.wpi.cscore.AxisCamera;
 import edu.wpi.cscore.CvSink;
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/vision/intermediatevision/Robot.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/intermediatevision/Robot.java
old mode 100755
new mode 100644
similarity index 97%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/vision/intermediatevision/Robot.java
rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/intermediatevision/Robot.java
index ae2caa200f..a4ee8b4ee5
--- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/vision/intermediatevision/Robot.java
+++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/intermediatevision/Robot.java
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.examples.vision.intermediatevision;
+package edu.wpi.first.wpilibj.examples.intermediatevision;
 
 import edu.wpi.cscore.CvSink;
 import edu.wpi.cscore.CvSource;
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/vision/quickvision/Robot.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/quickvision/Robot.java
old mode 100755
new mode 100644
similarity index 94%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/vision/quickvision/Robot.java
rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/quickvision/Robot.java
index 236b3a6661..b27172107b
--- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/vision/quickvision/Robot.java
+++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/quickvision/Robot.java
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.examples.vision.quickvision;
+package edu.wpi.first.wpilibj.examples.quickvision;
 
 import edu.wpi.first.wpilibj.CameraServer;
 import edu.wpi.first.wpilibj.IterativeRobot;