added folders and changed some names