Organize

src/com/nutrons/nu17/OI.java

@@ -2,6 +2,11 @@
 
 import com.nutrons.nu17.RobotMap;
 import com.nutrons.nu17.commands.*;
+import com.nutrons.nu17.commands.GearControl.LowerGearPlacerCmd;
+import com.nutrons.nu17.commands.GearControl.RaiseGearPlacerCmd;
+import com.nutrons.nu17.commands.Intake.GroundIntakeCmd;
+import com.nutrons.nu17.commands.Intake.GroundIntakeSpitCmd;
+import com.nutrons.nu17.commands.Shooters.ShootShooterCmd;
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;

src/com/nutrons/nu17/Robot.java

@@ -5,6 +5,12 @@
 import edu.wpi.first.wpilibj.livewindow.LiveWindow;
 import com.nutrons.nu17.OI;
 import com.nutrons.nu17.subsystems.*;
+import com.nutrons.nu17.subsystems.Climber.Climber;
+import com.nutrons.nu17.subsystems.Drivetrain.Drivetrain;
+import com.nutrons.nu17.subsystems.GearControl.GearPlacer;
+import com.nutrons.nu17.subsystems.Intake.GroundIntake;
+import com.nutrons.nu17.subsystems.Shooters.Shooter;
+import com.nutrons.nu17.subsystems.Shooters.TwinShooter;
 
 public class Robot extends IterativeRobot {
 

src/com/nutrons/nu17/commands/ClimberCmd.java → src/com/nutrons/nu17/commands/Climber/ClimberCmd.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.commands;
+package com.nutrons.nu17.commands.Climber;
 
 import com.nutrons.nu17.Robot;
 import edu.wpi.first.wpilibj.command.Command;

src/com/nutrons/nu17/commands/LowerGearPlacerCmd.java → src/com/nutrons/nu17/commands/GearControl/LowerGearPlacerCmd.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.commands;
+package com.nutrons.nu17.commands.GearControl;
 
 import com.nutrons.nu17.Robot;
 

src/com/nutrons/nu17/commands/RaiseGearPlacerCmd.java → src/com/nutrons/nu17/commands/GearControl/RaiseGearPlacerCmd.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.commands;
+package com.nutrons.nu17.commands.GearControl;
 
 import com.nutrons.nu17.Robot;
 

src/com/nutrons/nu17/commands/GroundIntakeCmd.java → src/com/nutrons/nu17/commands/Intake/GroundIntakeCmd.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.commands;
+package com.nutrons.nu17.commands.Intake;
 
 import com.nutrons.nu17.Robot;
 import edu.wpi.first.wpilibj.command.Command;

src/com/nutrons/nu17/commands/GroundIntakeSpitCmd.java → src/com/nutrons/nu17/commands/Intake/GroundIntakeSpitCmd.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.commands;
+package com.nutrons.nu17.commands.Intake;
 
 import com.nutrons.nu17.Robot;
 import edu.wpi.first.wpilibj.command.Command;

src/com/nutrons/nu17/commands/ShootShooterCmd.java → src/com/nutrons/nu17/commands/Shooters/ShootShooterCmd.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.commands;
+package com.nutrons.nu17.commands.Shooters;
 
 import com.nutrons.nu17.Robot;
 

src/com/nutrons/nu17/commands/ShootTwinShooterCmd.java → src/com/nutrons/nu17/commands/Shooters/ShootTwinShooterCmd.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.commands;
+package com.nutrons.nu17.commands.Shooters;
 
 import com.nutrons.nu17.Robot;
 import edu.wpi.first.wpilibj.command.Command;

src/com/nutrons/nu17/subsystems/Climber.java → src/com/nutrons/nu17/subsystems/Climber/Climber.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.subsystems;
+package com.nutrons.nu17.subsystems.Climber;
 
 import com.nutrons.nu17.RobotMap;
 import edu.wpi.first.wpilibj.DigitalInput;

src/com/nutrons/nu17/subsystems/Drivetrain.java → src/com/nutrons/nu17/subsystems/Drivetrain/Drivetrain.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.subsystems;
+package com.nutrons.nu17.subsystems.Drivetrain;
 
 import com.ctre.CANTalon;
 import com.nutrons.nu17.OI;

src/com/nutrons/nu17/subsystems/GearPlacer.java → src/com/nutrons/nu17/subsystems/GearControl/GearPlacer.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.subsystems;
+package com.nutrons.nu17.subsystems.GearControl;
 
 import com.nutrons.nu17.RobotMap;
 

src/com/nutrons/nu17/subsystems/GroundIntake.java → src/com/nutrons/nu17/subsystems/Intake/GroundIntake.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.subsystems;
+package com.nutrons.nu17.subsystems.Intake;
 
 import com.nutrons.nu17.RobotMap;
 

src/com/nutrons/nu17/subsystems/Shooter.java → src/com/nutrons/nu17/subsystems/Shooters/Shooter.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.subsystems;
+package com.nutrons.nu17.subsystems.Shooters;
 
 import com.nutrons.nu17.Robot;
 import com.nutrons.nu17.RobotMap;

src/com/nutrons/nu17/subsystems/HoodShooterFlywheel.java → src/com/nutrons/nu17/subsystems/Shooters/Turret.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.subsystems;
+package com.nutrons.nu17.subsystems.Shooters;
 
 import com.nutrons.nu17.RobotMap;
 
@@ -10,7 +10,7 @@
 import edu.wpi.first.wpilibj.Talon;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
-public class HoodShooterFlywheel extends Subsystem {
+public class Turret extends Subsystem {
 
 	private final Talon FLY_WHEEL_LEFT = new Talon(RobotMap.FLY_WHEEL_LEFT);
 	private final Talon FLY_WHEEL_RIGHT = new Talon(RobotMap.FLY_WHEEL_RIGHT);

src/com/nutrons/nu17/subsystems/TwinShooter.java → src/com/nutrons/nu17/subsystems/Shooters/TwinShooter.java

@@ -1,4 +1,4 @@
-package com.nutrons.nu17.subsystems;
+package com.nutrons.nu17.subsystems.Shooters;
 
 import com.nutrons.nu17.RobotMap;