restructure environment