Folder restructor for better usability