renames and reorganizes some things