Feature/new structure sass