diff --git a/.gitignore b/.gitignore
index 133620f..0852c56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ DriveBase/sysProps.xml
 .settings/*
 Robot2016/.settings
 Robot2016/sysProps.xml
+FRCUserProgram
+/RemoteSystemsTempFiles/
diff --git a/FRCUserProgram b/FRCUserProgram
deleted file mode 100755
index bcba85b..0000000
Binary files a/FRCUserProgram and /dev/null differ
diff --git a/RemoteSystemsTempFiles/.project b/RemoteSystemsTempFiles/.project
deleted file mode 100644
index 5447a64..0000000
--- a/RemoteSystemsTempFiles/.project
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>RemoteSystemsTempFiles</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.rse.ui.remoteSystemsTempNature</nature>
-	</natures>
-</projectDescription>
diff --git a/Makefile b/Robot2016/Makefile
similarity index 100%
rename from Makefile
rename to Robot2016/Makefile
diff --git a/robot.cpp b/robot.cpp
deleted file mode 100644
index 9565107..0000000
--- a/robot.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "WPILib.h"
-
-/**
- * This is a demo program showing the use of the RobotDrive class.
- * The SampleRobot class is the base of a robot application that will automatically call your
- * Autonomous and OperatorControl methods at the right time as controlled by the switches on
- * the driver station or the field controls.
- *
- * WARNING: While it may look like a good choice to use for your code if you're inexperienced,
- * don't. Unless you know what you are doing, complex code will be much more difficult under
- * this system. Use IterativeRobot or Command-Based instead if you're new.
- */
-class Robot: public SampleRobot
-{
-	RobotDrive myRobot; // robot drive system
-	Joystick stick; // only joystick
-
-public:
-	Robot() :
-			myRobot(0, 1),	// initialize the RobotDrive to use motor controllers on ports 0 and 1
-			stick(0)
-	{
-		myRobot.SetExpiration(0.1);
-	}
-
-	/**
-	 * Runs the motors with arcade steering.
-	 */
-	void OperatorControl()
-	{
-		while (IsOperatorControl() && IsEnabled())
-		{
-			myRobot.ArcadeDrive(stick); // drive with arcade style (use right stick)
-			Wait(0.005);				// wait for a motor update time
-		}
-	}
-
-};
-
-START_ROBOT_CLASS(Robot)
-