refactory env folder