diff --git a/Robot2018/.classpath b/Robot2018/.classpath
new file mode 100644
index 0000000..31c9d63
--- /dev/null
+++ b/Robot2018/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="var" path="wpilib" sourcepath="wpilib.sources"/>
+	<classpathentry kind="var" path="networktables" sourcepath="networktables.sources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="var" path="opencv" sourcepath="opencv.sources"/>
+	<classpathentry kind="var" path="cscore" sourcepath="cscore.sources"/>
+	<classpathentry kind="var" path="wpiutil" sourcepath="wpiutil.sources"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Robot2018/.gitignore b/Robot2018/.gitignore
index e98b718..8470e34 100644
--- a/Robot2018/.gitignore
+++ b/Robot2018/.gitignore
@@ -1,5 +1,4 @@
 /bin/
 /build/
 /dist/
-.classpath
-.DS_Store
\ No newline at end of file
+.DS_Store
diff --git a/Robot2018/build.properties b/Robot2018/build.properties
index 95d84e9..6e4c329 100644
--- a/Robot2018/build.properties
+++ b/Robot2018/build.properties
@@ -1,4 +1,4 @@
 # Project specific information
-package=org.usfirst.frc.team199.robot
+package=org.usfirst.frc.team199.Robot2018
 robot.class=${package}.Robot
 simulation.world.file=/usr/share/frcsim/worlds/GearsBotDemo.world
\ No newline at end of file
diff --git a/Robot2018/src/org/usfirst/frc/team199/robot/OI.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/OI.java
similarity index 92%
rename from Robot2018/src/org/usfirst/frc/team199/robot/OI.java
rename to Robot2018/src/org/usfirst/frc/team199/Robot2018/OI.java
index b152dca..0907cd1 100644
--- a/Robot2018/src/org/usfirst/frc/team199/robot/OI.java
+++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/OI.java
@@ -1,8 +1,8 @@
-package org.usfirst.frc.team199.robot;
+package org.usfirst.frc.team199.Robot2018;
 
 import edu.wpi.first.wpilibj.buttons.Button;
 
-import org.usfirst.frc.team199.robot.commands.ExampleCommand;
+import org.usfirst.frc.team199.Robot2018.commands.ExampleCommand;
 
 /**
  * This class is the glue that binds the controls on the physical operator
diff --git a/Robot2018/src/org/usfirst/frc/team199/robot/Robot.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java
similarity index 94%
rename from Robot2018/src/org/usfirst/frc/team199/robot/Robot.java
rename to Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java
index ddd5af5..c5d60de 100644
--- a/Robot2018/src/org/usfirst/frc/team199/robot/Robot.java
+++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java
@@ -1,5 +1,5 @@
 
-package org.usfirst.frc.team199.robot;
+package org.usfirst.frc.team199.Robot2018;
 
 import edu.wpi.first.wpilibj.IterativeRobot;
 import edu.wpi.first.wpilibj.command.Command;
@@ -8,8 +8,8 @@
 import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 
-import org.usfirst.frc.team199.robot.commands.ExampleCommand;
-import org.usfirst.frc.team199.robot.subsystems.ExampleSubsystem;
+import org.usfirst.frc.team199.Robot2018.commands.ExampleCommand;
+import org.usfirst.frc.team199.Robot2018.subsystems.ExampleSubsystem;
 
 /**
  * The VM is configured to automatically run this class, and to call the
@@ -111,6 +111,5 @@ public void teleopPeriodic() {
 	 */
 	@Override
 	public void testPeriodic() {
-		LiveWindow.run();
 	}
 }
diff --git a/Robot2018/src/org/usfirst/frc/team199/robot/RobotMap.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java
similarity index 94%
rename from Robot2018/src/org/usfirst/frc/team199/robot/RobotMap.java
rename to Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java
index 5a84e8b..89d004b 100644
--- a/Robot2018/src/org/usfirst/frc/team199/robot/RobotMap.java
+++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team199.robot;
+package org.usfirst.frc.team199.Robot2018;
 
 /**
  * The RobotMap is a mapping from the ports sensors and actuators are wired into
diff --git a/Robot2018/src/org/usfirst/frc/team199/robot/commands/ExampleCommand.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/ExampleCommand.java
similarity index 89%
rename from Robot2018/src/org/usfirst/frc/team199/robot/commands/ExampleCommand.java
rename to Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/ExampleCommand.java
index aef651f..3d44681 100644
--- a/Robot2018/src/org/usfirst/frc/team199/robot/commands/ExampleCommand.java
+++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/ExampleCommand.java
@@ -1,8 +1,8 @@
-package org.usfirst.frc.team199.robot.commands;
+package org.usfirst.frc.team199.Robot2018.commands;
 
 import edu.wpi.first.wpilibj.command.Command;
 
-import org.usfirst.frc.team199.robot.Robot;
+import org.usfirst.frc.team199.Robot2018.Robot;
 
 /**
  *
diff --git a/Robot2018/src/org/usfirst/frc/team199/robot/subsystems/ExampleSubsystem.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ExampleSubsystem.java
similarity index 86%
rename from Robot2018/src/org/usfirst/frc/team199/robot/subsystems/ExampleSubsystem.java
rename to Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ExampleSubsystem.java
index 6e5d6e4..fb64793 100644
--- a/Robot2018/src/org/usfirst/frc/team199/robot/subsystems/ExampleSubsystem.java
+++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ExampleSubsystem.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team199.robot.subsystems;
+package org.usfirst.frc.team199.Robot2018.subsystems;
 
 import edu.wpi.first.wpilibj.command.Subsystem;