Renamed and reorganized some things