Reorganized Files for turning in

Signed-off-by: ElectricDrake <cgecko@gmail.com>