Folder restructure, dialog box addition