[Adam] merged with latest folder changes