[split] Organized virtual folders
[merge] Renaming