Updated pattern folder structure