reorganization/renaming stuff

mhmm