Still just cleaning up. Renamed a couple files