Rename index stuff to 'AddFolder'
Additional changes