changes some structural stuff and modules