Update folder structure and scss files