Re-organized files in folders