Renamed and organized some things