Renamed and Reorganized alot

Connor