added folders, updated settings.