refactor to one sub dir per env