uploading changes 1 and 2

Also fixed folders