diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index cf452d18..8c55642e 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -18,4 +18,5 @@ jobs:
         java-version: 1.11
     
     - name: Build Robot
+      working-directory: gitflow
       run: ./gradlew build
diff --git a/.gitignore b/.gitignore
index f649a5b8..c2acc799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -247,8 +247,3 @@ imgui.ini
 **/build/
 
 # End of https://www.gitignore.io/api/java,gradle,intellij+iml,visualstudiocode,linux,macos,windows,c++,visualstudiocode
-
-# SnobotSim
-logs/
-simulator_config/joystick_config.properties
-simulator_config/networktables.ini*
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
index 8b279ecc..b4d59746 100644
--- a/.idea/checkstyle-idea.xml
+++ b/.idea/checkstyle-idea.xml
@@ -3,7 +3,7 @@
   <component name="CheckStyle-IDEA">
     <option name="configuration">
       <map>
-        <entry key="checkstyle-version" value="8.31" />
+        <entry key="checkstyle-version" value="8.35" />
         <entry key="copy-libs" value="true" />
         <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
         <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index be2c0789..360d415a 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,10 +21,25 @@
       <option name="name" value="WPIOfficialRelease" />
       <option name="url" value="https://frcmaven.wpi.edu/artifactory/release" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="SnobotSim" />
+      <option name="name" value="SnobotSim" />
+      <option name="url" value="http://raw.githubusercontent.com/snobotsim/maven_repo/master/development" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:/$MAVEN_REPOSITORY$/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="WPILocal" />
       <option name="name" value="WPILocal" />
       <option name="url" value="file:/$PROJECT_DIR$/../../../../../../Public/wpilib/2020/maven/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="Wpi" />
+      <option name="name" value="Wpi" />
+      <option name="url" value="http://first.wpi.edu/FRC/roborio/maven/release/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Build___Deploy_Robot.xml b/.idea/runConfigurations/Build___Deploy_Robot.xml
deleted file mode 100644
index 1052ad42..00000000
--- a/.idea/runConfigurations/Build___Deploy_Robot.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build &amp; Deploy Robot" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="deploy" />
-        </list>
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Build___Deploy_Robot_for_Debugging.xml b/.idea/runConfigurations/Build___Deploy_Robot_for_Debugging.xml
deleted file mode 100644
index bb2519c3..00000000
--- a/.idea/runConfigurations/Build___Deploy_Robot_for_Debugging.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build &amp; Deploy Robot for Debugging" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PdebugMode=true" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="deploy" />
-        </list>
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Clean_Build___Deploy_Robot.xml b/.idea/runConfigurations/Clean_Build___Deploy_Robot.xml
deleted file mode 100644
index 363be117..00000000
--- a/.idea/runConfigurations/Clean_Build___Deploy_Robot.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Clean Build &amp; Deploy Robot" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="clean" />
-          <option value="deploy" />
-        </list>
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Clean_Build___Deploy_Robot_for_Debugging.xml b/.idea/runConfigurations/Clean_Build___Deploy_Robot_for_Debugging.xml
deleted file mode 100644
index b131f74c..00000000
--- a/.idea/runConfigurations/Clean_Build___Deploy_Robot_for_Debugging.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Clean Build &amp; Deploy Robot for Debugging" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PdebugMode=true" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="clean" />
-          <option value="deploy" />
-        </list>
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Clean_Build_Robot.xml b/.idea/runConfigurations/_girflow__Clean_Build_Robot.xml
similarity index 63%
rename from .idea/runConfigurations/Clean_Build_Robot.xml
rename to .idea/runConfigurations/_girflow__Clean_Build_Robot.xml
index 50856214..53071581 100644
--- a/.idea/runConfigurations/Clean_Build_Robot.xml
+++ b/.idea/runConfigurations/_girflow__Clean_Build_Robot.xml
@@ -1,10 +1,10 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Clean Build Robot" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="(girflow) Clean Build Robot" type="GradleRunConfiguration" factoryName="Gradle" folderName="Gitflow">
     <ExternalSystemSettings>
       <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/gitflow" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
@@ -14,7 +14,7 @@
           <option value="build" />
         </list>
       </option>
-      <option name="vmOptions" />
+      <option name="vmOptions" value="" />
     </ExternalSystemSettings>
     <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
     <method v="2" />
diff --git a/.idea/runConfigurations/Build_Robot.xml b/.idea/runConfigurations/_gitflow__Build_Robot.xml
similarity index 62%
rename from .idea/runConfigurations/Build_Robot.xml
rename to .idea/runConfigurations/_gitflow__Build_Robot.xml
index f9efba4a..4816288f 100644
--- a/.idea/runConfigurations/Build_Robot.xml
+++ b/.idea/runConfigurations/_gitflow__Build_Robot.xml
@@ -1,10 +1,10 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build Robot" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="(gitflow) Build Robot" type="GradleRunConfiguration" factoryName="Gradle" folderName="Gitflow">
     <ExternalSystemSettings>
       <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/gitflow" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
@@ -13,7 +13,7 @@
           <option value="build" />
         </list>
       </option>
-      <option name="vmOptions" />
+      <option name="vmOptions" value="" />
     </ExternalSystemSettings>
     <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
     <method v="2" />
diff --git a/.idea/runConfigurations/Run_Snobot_Sim.xml b/.idea/runConfigurations/_gitflow__Run_Snobot_Sim.xml
similarity index 74%
rename from .idea/runConfigurations/Run_Snobot_Sim.xml
rename to .idea/runConfigurations/_gitflow__Run_Snobot_Sim.xml
index 306a847b..2001e8a9 100644
--- a/.idea/runConfigurations/Run_Snobot_Sim.xml
+++ b/.idea/runConfigurations/_gitflow__Run_Snobot_Sim.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Snobot Sim" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="(gitflow) Run Snobot Sim" type="GradleRunConfiguration" factoryName="Gradle" folderName="Gitflow">
     <ExternalSystemSettings>
       <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/gitflow" />
       <option name="externalSystemIdString" value="GRADLE" />
       <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..35eb1ddf 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Codelab.iml b/Codelab.iml
new file mode 100644
index 00000000..c90834f2
--- /dev/null
+++ b/Codelab.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/gitflow/.gitignore b/gitflow/.gitignore
new file mode 100644
index 00000000..f649a5b8
--- /dev/null
+++ b/gitflow/.gitignore
@@ -0,0 +1,254 @@
+# Dynamically generated by IntelliJ IDEA FRC Plugin on Monday April 6, 2020 7:25:12 PM EDT using https://gitignore.io
+
+# Created by https://www.gitignore.io/api/java,gradle,intellij+iml,visualstudiocode,linux,macos,windows,c++,visualstudiocode
+# Edit at https://www.gitignore.io/?templates=java,gradle,intellij+iml,visualstudiocode,linux,macos,windows,c++,visualstudiocode
+
+### C++ ###
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+### Intellij+iml ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Intellij+iml Patch ###
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+### Gradle ###
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+# # VS Code Specific Java Settings
+.classpath
+.project
+.settings/
+bin/
+imgui.ini
+
+### Gradle Patch ###
+**/build/
+
+# End of https://www.gitignore.io/api/java,gradle,intellij+iml,visualstudiocode,linux,macos,windows,c++,visualstudiocode
+
+# SnobotSim
+logs/
+simulator_config/joystick_config.properties
+simulator_config/networktables.ini*
diff --git a/.vscode/launch.json b/gitflow/.vscode/launch.json
similarity index 100%
rename from .vscode/launch.json
rename to gitflow/.vscode/launch.json
diff --git a/.vscode/settings.json b/gitflow/.vscode/settings.json
similarity index 100%
rename from .vscode/settings.json
rename to gitflow/.vscode/settings.json
diff --git a/.wpilib/wpilib_preferences.json b/gitflow/.wpilib/wpilib_preferences.json
similarity index 100%
rename from .wpilib/wpilib_preferences.json
rename to gitflow/.wpilib/wpilib_preferences.json
diff --git a/build.gradle b/gitflow/build.gradle
similarity index 100%
rename from build.gradle
rename to gitflow/build.gradle
diff --git a/first-bsd-license.txt b/gitflow/first-bsd-license.txt
similarity index 100%
rename from first-bsd-license.txt
rename to gitflow/first-bsd-license.txt
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gitflow/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.jar
rename to gitflow/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gitflow/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.properties
rename to gitflow/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/gitflow/gradlew
similarity index 100%
rename from gradlew
rename to gitflow/gradlew
diff --git a/gradlew.bat b/gitflow/gradlew.bat
similarity index 100%
rename from gradlew.bat
rename to gitflow/gradlew.bat
diff --git a/settings.gradle b/gitflow/settings.gradle
similarity index 100%
rename from settings.gradle
rename to gitflow/settings.gradle
diff --git a/simulator_config/simulator_config.properties b/gitflow/simulator_config/simulator_config.properties
similarity index 100%
rename from simulator_config/simulator_config.properties
rename to gitflow/simulator_config/simulator_config.properties
diff --git a/simulator_config/simulator_config.yml b/gitflow/simulator_config/simulator_config.yml
similarity index 100%
rename from simulator_config/simulator_config.yml
rename to gitflow/simulator_config/simulator_config.yml
diff --git a/snobotsim/SnobotSim.json b/gitflow/snobotsim/SnobotSim.json
similarity index 100%
rename from snobotsim/SnobotSim.json
rename to gitflow/snobotsim/SnobotSim.json
diff --git a/snobotsim/snobot_sim.gradle b/gitflow/snobotsim/snobot_sim.gradle
similarity index 100%
rename from snobotsim/snobot_sim.gradle
rename to gitflow/snobotsim/snobot_sim.gradle
diff --git a/src/main/deploy/example.txt b/gitflow/src/main/deploy/example.txt
similarity index 100%
rename from src/main/deploy/example.txt
rename to gitflow/src/main/deploy/example.txt
diff --git a/src/main/java/frc/robot/Constants.java b/gitflow/src/main/java/frc/robot/Constants.java
similarity index 100%
rename from src/main/java/frc/robot/Constants.java
rename to gitflow/src/main/java/frc/robot/Constants.java
diff --git a/src/main/java/frc/robot/Main.java b/gitflow/src/main/java/frc/robot/Main.java
similarity index 100%
rename from src/main/java/frc/robot/Main.java
rename to gitflow/src/main/java/frc/robot/Main.java
diff --git a/src/main/java/frc/robot/Robot.java b/gitflow/src/main/java/frc/robot/Robot.java
similarity index 100%
rename from src/main/java/frc/robot/Robot.java
rename to gitflow/src/main/java/frc/robot/Robot.java
diff --git a/src/main/java/frc/robot/RobotContainer.java b/gitflow/src/main/java/frc/robot/RobotContainer.java
similarity index 100%
rename from src/main/java/frc/robot/RobotContainer.java
rename to gitflow/src/main/java/frc/robot/RobotContainer.java
diff --git a/src/main/java/frc/robot/commands/TelopDriveCommand.java b/gitflow/src/main/java/frc/robot/commands/TelopDriveCommand.java
similarity index 100%
rename from src/main/java/frc/robot/commands/TelopDriveCommand.java
rename to gitflow/src/main/java/frc/robot/commands/TelopDriveCommand.java
diff --git a/src/main/java/frc/robot/subsystems/ChassisSubsystem.java b/gitflow/src/main/java/frc/robot/subsystems/ChassisSubsystem.java
similarity index 100%
rename from src/main/java/frc/robot/subsystems/ChassisSubsystem.java
rename to gitflow/src/main/java/frc/robot/subsystems/ChassisSubsystem.java
diff --git a/src/main/java/frc/robot/subsystems/PJCodelab2020Part1Subsystem.java b/gitflow/src/main/java/frc/robot/subsystems/PJCodelab2020Part1Subsystem.java
similarity index 100%
rename from src/main/java/frc/robot/subsystems/PJCodelab2020Part1Subsystem.java
rename to gitflow/src/main/java/frc/robot/subsystems/PJCodelab2020Part1Subsystem.java
diff --git a/src/main/java/frc/robot/subsystems/PJCodelab2020Part2Subsystem.java b/gitflow/src/main/java/frc/robot/subsystems/PJCodelab2020Part2Subsystem.java
similarity index 100%
rename from src/main/java/frc/robot/subsystems/PJCodelab2020Part2Subsystem.java
rename to gitflow/src/main/java/frc/robot/subsystems/PJCodelab2020Part2Subsystem.java
diff --git a/styleguide.gradle b/gitflow/styleguide.gradle
similarity index 87%
rename from styleguide.gradle
rename to gitflow/styleguide.gradle
index ee66e021..e9c53675 100644
--- a/styleguide.gradle
+++ b/gitflow/styleguide.gradle
@@ -6,7 +6,7 @@ apply plugin: 'checkstyle'
 
 checkstyle {
     toolVersion = "8.28"
-    configDir = file("${project.rootDir}/styleguide")
+    configDir = file("${project.rootDir}/../styleguide")
     config = resources.text.fromFile(new File(configDir, "checkstyle.xml"))
 }
 
diff --git a/vendordeps/WPILibNewCommands.json b/gitflow/vendordeps/WPILibNewCommands.json
similarity index 100%
rename from vendordeps/WPILibNewCommands.json
rename to gitflow/vendordeps/WPILibNewCommands.json