Move files into subfolders
Add separate settings page