keep AE's folder structure
update samples
small changes