Added main-wrapper (otherwise not working as module). Fixed name error in add_folder.