Re-structure files and folders