Renaming some things and rerranging the hierarhcy