diff --git a/cameraserver/multiCameraServer/build.gradle b/cameraserver/multiCameraServer/build.gradle
index 88a6f0e225..e8565cd4e0 100644
--- a/cameraserver/multiCameraServer/build.gradle
+++ b/cameraserver/multiCameraServer/build.gradle
@@ -18,7 +18,7 @@ ext {
 
 apply from: "${rootDir}/shared/opencv.gradle"
 
-mainClassName = 'Main'
+mainClassName = 'edu.wpi.Main'
 
 apply plugin: 'com.github.johnrengelman.shadow'
 
diff --git a/cameraserver/multiCameraServer/src/main/java/Main.java b/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java
similarity index 98%
rename from cameraserver/multiCameraServer/src/main/java/Main.java
rename to cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java
index 8bcc54d031..70098cd2eb 100644
--- a/cameraserver/multiCameraServer/src/main/java/Main.java
+++ b/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java
@@ -1,10 +1,12 @@
 /*----------------------------------------------------------------------------*/
-/* Copyright (c) 2018 FIRST. All Rights Reserved.                             */
+/* Copyright (c) 2018-2020 FIRST. All Rights Reserved.                        */
 /* Open Source Software - may be modified and shared by FRC teams. The code   */
 /* must be accompanied by the FIRST BSD license file in the root directory of */
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+package edu.wpi;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
diff --git a/hal/build.gradle b/hal/build.gradle
index d744259135..75ee2a8197 100644
--- a/hal/build.gradle
+++ b/hal/build.gradle
@@ -62,7 +62,7 @@ ext {
 
     nativeName = 'hal'
     setBaseName = 'wpiHal'
-    devMain = 'DevMain'
+    devMain = 'edu.wpi.first.hal.DevMain'
     niLibraries = true
     generatedHeaders = "$buildDir/generated/headers"
     jniSplitSetup = {
diff --git a/hal/src/dev/java/DevMain.java b/hal/src/dev/java/edu/wpi/first/hal/DevMain.java
similarity index 85%
rename from hal/src/dev/java/DevMain.java
rename to hal/src/dev/java/edu/wpi/first/hal/DevMain.java
index 8cdb8bad40..25c6c905cb 100644
--- a/hal/src/dev/java/DevMain.java
+++ b/hal/src/dev/java/edu/wpi/first/hal/DevMain.java
@@ -1,10 +1,12 @@
 /*----------------------------------------------------------------------------*/
-/* Copyright (c) 2018 FIRST. All Rights Reserved.                             */
+/* Copyright (c) 2018-2020 FIRST. All Rights Reserved.                        */
 /* Open Source Software - may be modified and shared by FRC teams. The code   */
 /* must be accompanied by the FIRST BSD license file in the root directory of */
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+package edu.wpi.first.hal;
+
 public final class DevMain {
   public static void main(String[] args) {
 
diff --git a/myRobot/build.gradle b/myRobot/build.gradle
index d2f11947f6..ffb59f0750 100644
--- a/myRobot/build.gradle
+++ b/myRobot/build.gradle
@@ -109,7 +109,7 @@ tasks.register('deployStatic') {
     }
 }
 
-mainClassName = 'Main'
+mainClassName = 'frc.robot.Main'
 
 apply plugin: 'com.github.johnrengelman.shadow'
 
diff --git a/myRobot/src/main/java/Main.java b/myRobot/src/main/java/frc/robot/Main.java
similarity index 90%
rename from myRobot/src/main/java/Main.java
rename to myRobot/src/main/java/frc/robot/Main.java
index aee472a208..070dd31bfe 100644
--- a/myRobot/src/main/java/Main.java
+++ b/myRobot/src/main/java/frc/robot/Main.java
@@ -1,10 +1,12 @@
 /*----------------------------------------------------------------------------*/
-/* Copyright (c) 2018 FIRST. All Rights Reserved.                             */
+/* Copyright (c) 2018-2020 FIRST. All Rights Reserved.                        */
 /* Open Source Software - may be modified and shared by FRC teams. The code   */
 /* must be accompanied by the FIRST BSD license file in the root directory of */
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+package frc.robot;
+
 import edu.wpi.first.wpilibj.RobotBase;
 
 public final class Main {
diff --git a/myRobot/src/main/java/MyRobot.java b/myRobot/src/main/java/frc/robot/MyRobot.java
similarity index 94%
rename from myRobot/src/main/java/MyRobot.java
rename to myRobot/src/main/java/frc/robot/MyRobot.java
index fc69d42481..3166944fd5 100644
--- a/myRobot/src/main/java/MyRobot.java
+++ b/myRobot/src/main/java/frc/robot/MyRobot.java
@@ -1,10 +1,12 @@
 /*----------------------------------------------------------------------------*/
-/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Copyright (c) 2016-2020 FIRST. All Rights Reserved.                        */
 /* Open Source Software - may be modified and shared by FRC teams. The code   */
 /* must be accompanied by the FIRST BSD license file in the root directory of */
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+package frc.robot;
+
 import edu.wpi.first.wpilibj.TimedRobot;
 
 @SuppressWarnings("all")
diff --git a/styleguide/checkstyle.xml b/styleguide/checkstyle.xml
index 758cee43fa..eeeaf08e18 100644
--- a/styleguide/checkstyle.xml
+++ b/styleguide/checkstyle.xml
@@ -314,5 +314,6 @@ module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
                 value="expected" />
     </module>
     <module name="CommentsIndentation" />
+    <module name="PackageDeclaration"/>
   </module>
 </module>