Changed to use Style folder structure