Added ability to move out an extra folder