Reorganized folder and file