organized stuff and add env for install