fix env to work under new folder structure